Fix bug with oneToOne