Fixing up store issue