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