Fix step calculations