Fixes configuration issue
Merge branch 'fix-configuration'