Fixing WillChange Value values.