issue #806 fixed