Fixed joining bug maybe