Fix context updating in store