issue #918