Fix validation api #5