#314 fix for tooltip