Snapping behaviour  fix

* Snapping behavior for all steps