Fix potential race condition with batched updates

[tardate]

I think I spy a potential race condition with the batch-update option. There's an easy fix, but if this is a concern in the short term, just don't use the batch_size option.