Bubbles bugfix (Works OK)