Fix store bug