fixed incorrect validation rules