Fix work with storage