Fix folder checking issue
Merge branch 'hotfix/1.1.2'