Fix step listeners