Fix validation issue