Handle it for step into too