core metrics fix