Debug next step fix