Validation fixing