Fix for missing tooltips