Call context store commads issue fix