Fixes #21
Fixes #20 I should stop testing random stuff in the release code