Fix Validation ext based on Pierre and Baptiste feedbacks