Fixing BAM-1670

Fix for BAM-1670