Fixed issue with configuration setup