Add test case for #557