Fix mass grading

Fixes #110