Merge branch 'hotfix/727'

Close #727
Fix typo
Merge branch 'hotfix/#730' into develop
Closed #730