Hotfix: metrics fixes
Merge pull request #91 from VasilyKolpakov/hotfix/metrics_fixes

Hotfix: metrics fixes