Improve backtracing on step