Finish join fix, which was incomplete in the last commit
Finish join fix, which was incomplete in the last commit

csinitiative/trisano,csinitiative/trisano,csinitiative/trisano,csinitiative/trisano,csinitiative/trisano