fixing validation errors 24