CARE#4: Fixed PreUpdate event issue