fixed issue #800