Fix relation
Add AC#17