Fix of form validation