fix to BAM-1748

Please merge this pull request