Fixes #1 through a bit of writing