Fix Storage
Merge pull request #1 from Shabbypenguin/cm-11.0

Fix Storage