fixup storage