possible fix for BATCH-1980