issue #810 fixed