issue #736