Fix for bubbles