Fix initial position code