Fixed issue in metrics helper #5