Add test for #609