Fixed BB bug 13