Fix Validate