Fix fancy join