metrics fix for 1.5