Change: improvment of validation