Fix issue #17

This *would* fix the problem I outlined in issue #17, but I am not sure if this doesn't break anything. I can't run the tests for some reason.