Fix to correct shop access (pending revision, just pushed for allowing the rest of the team continuing working)