Fixing BAM-1670