fix issue #810