issue #337