fixed #893
Merge branch 'issue-893' into develop