Fixes #22

Probably.