another attempt to fix JoinColumn annotation handling