Fixed Validate method