Fix for metrics to avoid duplicate output