Fix initial splitting