Fix Validation