Additional fix in metrics (OMS-184)