Fix for #173 tooltips
fix merge conflict