BM2 fixed