diff --git a/exporter.py b/exporter.py
index 74337d4..611e9b6 100755
--- a/exporter.py
+++ b/exporter.py
@@ -460,22 +460,21 @@ if __name__ == "__main__":
             data_replies = "%s\n%s\n\n%s" % (header_str, sep_str, data_replies)
         save(data_replies, "channel-replies_%s" % channel_id)
 
-    def save_channel(channel_id, channel_list, users):
-        ch_hist = channel_history(channel_id, oldest=a.fr, latest=a.to)
+    def save_channel(channel_hist, channel_id, channel_list, users):
         if a.json:
-            data_ch = ch_hist
+            data_ch = channel_hist
         else:
-            data_ch = parse_channel_history(ch_hist, users)
+            data_ch = parse_channel_history(channel_hist, users)
             ch_name, ch_type = name_from_ch_id(channel_id, channel_list)
             header_str = "%s Name: %s" % (ch_type, ch_name)
             data_ch = (
                 "Channel ID: %s\n%s\n%s Messages\n%s\n\n"
-                % (channel_id, header_str, len(ch_hist), sep_str)
+                % (channel_id, header_str, len(channel_hist), sep_str)
                 + data_ch
             )
         save(data_ch, "channel_%s" % channel_id)
         if a.r:
-            save_replies(ch_hist, channel_id, channel_list, users)
+            save_replies(channel_hist, channel_id, channel_list, users)
 
     ch_list = channel_list()
     user_list = user_list()
@@ -488,13 +487,15 @@ if __name__ == "__main__":
         save(data, "user_list")
     if a.c:
         ch_id = a.ch
-        users = user_list
         if ch_id:
-            save_channel(ch_id, ch_list, users)
+            ch_hist = channel_history(ch_id, oldest=a.fr, latest=a.to)
+            save_channel(ch_hist, ch_id, ch_list, user_list)
         else:
             for ch_id in [x["id"] for x in ch_list]:
-                save_channel(ch_id, ch_list, users)
+                ch_hist = channel_history(ch_id, oldest=a.fr, latest=a.to)
+                save_channel(ch_hist, ch_id, ch_list, users)
     # elif, since we want to avoid asking for channel_history twice
     elif a.r:
         for ch_id in [x["id"] for x in channel_list()]:
-            save_replies(channel_history(ch_id), ch_id, ch_list, user_list)
+            ch_hist = channel_history(ch_id, oldest=a.fr, latest=a.to)
+            save_replies(ch_hist, ch_id, ch_list, user_list)