Fix instruction stepping