Correct implementation of metrics dictionary

Fixes #90.