Fix step exception in callbacks