Fix initial joining