Fixed OP context struct manipulation on non-persistent execution