fix remaining bb