Make sure we trigger self joins (and fix related bug)