Fix Storages 2