Minor BugFix relating to storage