Fix duplicate bubbles