Fixed tooltip remnant issue