Fix deassign on result change