Fix a case where users could cause duplicate joins