Fix initial join