Fixed bubble issues...