issue #507