Fix step timing functions when filling