fixed typo
Merge branch 'hotfix-1219'