Fixed gauges issue