issue #612