issue #355