Bug fix in cBBB