Validation error fix