Fix initial state