Handle mappedBy gracefully