Fix for BATCH-2154