fixed bug with storage