Progress on #16

We've uncovered bug #44