Added test for #537