Added test for #815