Fix storage bug