Fixed storage bug