Fix tooltip issue