Fix step helper