Fix validation helper
Fix Validation helper