Fixed #147, step out behaves itself now