issue #612 done