Fixing storage bug