Fix for new tooltip code