issue #940