Fixed MetricsCalculator problem that was producing all 0's