issue #370