Fixed JoinOptimizer