Storage constructor bugfix