Based on #93 (which was not correct), we attempt to resolve #86.

#93 was created by a user who no longer exists on github, so I cannot merge it and give credit to that user. The patch did introduce a couple of spec failures, and, here, I attempt to avoid them.

Note that we still need a spec to test this; I will ask participants in #86 for that.