issue #346