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