same fix for tooltips as in the master branch, to catch up here