Final solution to joining issues