Kjq/fixmetrics

Correct metrics branch