Fix last known issue with metrics