Fixed issues with B6