fix config
Merge branch 'hotfix/config-fix'