Fix ForeignKey join