Thanks for Stefan Chrobot @stefanchrobot for e-mailing me about
this bug with corresponding test case #113 and suggesting fix #114.
The actual fix that has been applied is more involved than Stefan's,
but resulting behaviour is similar, hopefully correct.

Close #113
Close #114