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