fixing validation errors 23