Handle 'joins' properly