Resolved a conflict with BMRM stuff