Fix OneToMany handling #675