issue #336