Fix prematurely expanding repeats, but now the progress bar doesn't count correctly