fix validation rules