Fixed bug in Opt and BB.