fixed validation-undo rules