Failing test for #35
Fix #35