Fixes #21 (probably)