Fix callback enqueue for batch execution

If an instance was updated while a callback were executing, 
it wouldn't enqueue the new callback call, few updates could be missed.