issue #372