iss1104 bugfix: undo and mandatory fields