WIP: Test and fix for issue 109