fixing validation errors 2