fix store stuff