Metrics fix for future versions.