Fixed bug where proper step was not being taken in some cases