fix error
Merge branch 'issue-42' into develop