Fix issue with storage.