Fixed tooltip issue