fix for BATCH-2106