Fix the join condition parsing