diff --git a/cck/driver/WizardMachine.cpp b/cck/driver/WizardMachine.cpp
index 31e07e1d888e..6303e6e298ca 100644
--- a/cck/driver/WizardMachine.cpp
+++ b/cck/driver/WizardMachine.cpp
@@ -872,10 +872,11 @@ BOOL CWizardMachineApp::GoToNextNode()
 	if (IsNewValue)
 		CreateNewCache();
 
-	if (!theInterpreter->interpret(tempNode->navControls->onEnter, NULL))
+	CurrentNode = tempNode;
+
+	if (!theInterpreter->interpret(CurrentNode->navControls->onEnter, NULL))
 		return FALSE;
 			
-	CurrentNode = tempNode;
 
 	return TRUE;
 }
@@ -966,10 +967,11 @@ BOOL CWizardMachineApp::GoToPrevNode()
 
 	if (IsNewValue)
 		CreateNewCache();
-	if (!theInterpreter->interpret(tempNode->navControls->onEnter, NULL))
-		return FALSE;
 	CurrentNode = tempNode;
 
+	if (!theInterpreter->interpret(CurrentNode->navControls->onEnter, NULL))
+		return FALSE;
+
 	return TRUE;
 
 }