Fix step event with callback