More work on #81
Another test case for #81