Fix flapping metrics reporting