Fixing bug with hbplus handling