Metrics bug fix