Fix step ordering