Fixing validation.