Fixing the issue with tooltip.