Bugfix mock storage