issue #407