Fixed bug with order in steps