MBH: fixing bugs