Validatation fixed