Fix change event, validate