Configuration Storage hotfix