fix to BAM-1748