This doesn't belong in this pull request. I believe that is a valid fix, referencing #33 but it should be in its own PR with tests.