Switching from guessed target calculation to "correct" step-based calculation