issue #350