Callcontext store commands fix