Takes stepping into account properly