Fix BG bug