Fix validation tool