Quick bug fix for important metrics