Values calculated correctly

Fixes #8