Fix for tooltip bug