Bubbles bug fix. (I think it works.)