Fix for BATCH-1767