Fix validation trail