fix storage loading/saving