Another fix of the validation