Fixed OneToMany case