Fix storage method