Fixing AddCompOp rollback code