BM fix

hopefully the last commit