fixed crash on join