Storage hotfix