Fixes #17 (I hope)