Fix for tooltip