Attempt at fixing metrics