Fixes store (strange context problem...)