Fix #621
Merge branch 'fix-621' into develop