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