fix
Merge branch 'hotfix/fix_config'