Fix tooltip again