Fixed bug with tooltips