Metrics fix