diff --git a/src/apps/debugger/user_interface/gui/team_window/ImageFunctionsView.cpp b/src/apps/debugger/user_interface/gui/team_window/ImageFunctionsView.cpp
index c1b606196a..281e2ecceb 100644
--- a/src/apps/debugger/user_interface/gui/team_window/ImageFunctionsView.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/ImageFunctionsView.cpp
@@ -169,8 +169,9 @@ public:
 	void SetImageDebugInfo(ImageDebugInfo* imageDebugInfo)
 	{
 		// unset old functions
+		int32 count = fChildPathComponents.CountItems();
 		if (fImageDebugInfo != NULL) {
-			for (int32 i = 0; i < fChildPathComponents.CountItems(); i++)
+			for (int32 i = 0; i < count; i++)
 				fChildPathComponents.ItemAt(i)->ReleaseReference();
 
 			fChildPathComponents.MakeEmpty();
@@ -182,7 +183,7 @@ public:
 		// set new functions
 		if (fImageDebugInfo == NULL || fImageDebugInfo->CountFunctions()
 				== 0) {
-			NotifyNodesCleared();
+			NotifyNodesRemoved(TreeTablePath(), 0, count);
 			return;
 		}