Added test for #535