Moved below so the onStop call comes after the onStep