Fixing bug bgs