Fixes #39 (i think)