fix joined functionality