I used Marius' suggestion (with one additional fix). The issue is demonstrated
by the test in @77cd8b16. This commit fixes
the failing test.

Fixes #64