Fix the tool tip issue