Fixes Race Condition

Fixes a Batch-Processing race condition.

Ref #356