Final tooltip fix (we hope)