fix for BATCH-2106

this is for the 2.2.x branch