Fixed the validation issues