fixing validation errors 22