...aaand fix the tooltip