Fixed race condition in controller store