Fixes #257

My explanation of this pull request is in #257.

I didn't explain myself well enough for my last pull request and that's my fault. Hopefully #257 explains it better.