issue #358