Minimal test case...

... And it does appear that my fix was not "the real thing". As I feared.

Issue #1 again!