diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index b98593c8a42..4893b0fe344 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -1218,7 +1218,7 @@ void Game::walkHero(int x, int y, SightDirection dir) {
 	}
 
 	// Save point of player's last target.
-	if(_loopStatus != kStatusInventory) {
+	if (_loopStatus != kStatusInventory) {
 		_lastTarget = target;
 	}
 
diff --git a/engines/draci/walking.cpp b/engines/draci/walking.cpp
index 1670c9a029a..6914898ec1a 100644
--- a/engines/draci/walking.cpp
+++ b/engines/draci/walking.cpp
@@ -452,6 +452,8 @@ void WalkingState::callback() {
 	const GPL2Program &originalCallback = *_callback;
 	_callback = NULL;
 	_vm->_script->runWrapper(originalCallback, _callbackOffset, true, false);
+	_callbackLast = NULL;
+	_callbackOffset = NULL;
 }
 
 void WalkingState::callbackLast() {