Call onStop after onStep is called. (onStop call was missing entirely?)