Fixed ManyToOne problem