Fix for initial Goal Tracker visit