issue 522 done