Fix step adaptation