fixed validation rules