Correct move target indices