Fix storage parsing