Fix store resolver