tooltips issue fix