Fixed bb bug 33