Fixed joining bug