issue #800