Fix mappedBy
(cherry picked from commit db335b4914efb62cdca730112d2f0d3616fa7a06)