Fix ChangedValues Handling