Fix GoalDetector