Add test #583