issue 522 fixed