Fixed restoration of storage state