fix #775
Merge branch 'pr790'