Fixed issue with tooltip