- added another check to make sure the tooltips are added and removed correctly