Added check so there aren't any future bubbles