Fix validation issues try 1