Fix weird stepping bug