Shuffling after repo move