diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 95eae4dd4..d2332b939 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -808,7 +808,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         int position = mChannel.getData().getSelected() + 1;
         boolean hasNext = position <= current && position > 0;
         if (hasNext) onItemClick(mChannel.getData().getList().get(position));
-        else nextChannel();
+        else fetch();
     }
 
     private void prevLine() {
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Catchup.java b/app/src/main/java/com/fongmi/android/tv/bean/Catchup.java
index 2a8a66682..d352604a8 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Catchup.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Catchup.java
@@ -108,7 +108,6 @@ public class Catchup {
 
     public String format(String url, EpgData data) {
         String result = getSource();
-        if (data.isInRange()) return url;
         Matcher matcher = Pattern.compile("(\\$?\\{[^}]*\\})").matcher(result);
         while (matcher.find()) result = result.replace(matcher.group(1), format(matcher.group(1), data.getStartTime(), data.getEndTime()));
         return isDefault() ? result : append(url, result);
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index e7770df85..6800f661e 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -859,7 +859,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
         int position = mChannel.getData().getSelected() + 1;
         boolean hasNext = position <= current && position > 0;
         if (hasNext) onItemClick(mChannel.getData().getList().get(position));
-        else nextChannel();
+        else fetch();
     }
 
     private void prevLine() {