Test for #359