Bugfix for gauges tracking code