fix mbc handling