more BM2 fix