Fixing the 'bubbles' bug...