Fix shuffle + repeat