issue #917