minor fix
Merge branch 'issue-171' into develop