fixed more validation