Fixed metrics bug