Fixed issue #407