fix to apply to the new MetricListener code