Fixed issues with BHG