fixing metrics stuff