Patch 2

Fixes #6
I had some trouble implementing a fix for this issue, if someone can find a better way, you're welcome to it.