Stores fix