Fix bug reported from store