fixed validator errors