Fixed Static Error
Merge branch 'hotfix-1.1.9'