issue #808 fixed