MBH: putting tables back to normal