The beginning of the tooltip fix...