issue #390