issue #339