Fix storage template