diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70294d6..c7c3875 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v0.6.5
+- Implemented more stable fix for bug still persisting after v0.6.4
+
 ## v0.6.4
 - Fixed upstream bug causing tracks to not download fully
 
diff --git a/setup.py b/setup.py
index b5a8292..45a0937 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ README = (HERE / "README.md").read_text()
 # This call to setup() does all the work
 setup(
     name="zotify",
-    version="0.6.4",
+    version="0.6.5",
     author="Zotify Contributors",
     description="A music and podcast downloader.",
     long_description=README,
diff --git a/zotify/podcast.py b/zotify/podcast.py
index adabc4a..f50d117 100644
--- a/zotify/podcast.py
+++ b/zotify/podcast.py
@@ -118,10 +118,13 @@ def download_episode(episode_id) -> None:
                 unit_divisor=1024
             ) as p_bar:
                 prepare_download_loader.stop()
-                for _ in range(int(total_size / Zotify.CONFIG.get_chunk_size()) + 2):
+                while True:
+                #for _ in range(int(total_size / Zotify.CONFIG.get_chunk_size()) + 2):
                     data = stream.input_stream.stream().read(Zotify.CONFIG.get_chunk_size())
                     p_bar.update(file.write(data))
                     downloaded += len(data)
+                    if data == b'':
+                        break
                     if Zotify.CONFIG.get_download_real_time():
                         delta_real = time.time() - time_start
                         delta_want = (downloaded / total_size) * (duration_ms/1000)
diff --git a/zotify/track.py b/zotify/track.py
index e031378..81cfccd 100644
--- a/zotify/track.py
+++ b/zotify/track.py
@@ -221,10 +221,13 @@ def download_track(mode: str, track_id: str, extra_keys=None, disable_progressba
                             unit_divisor=1024,
                             disable=disable_progressbar
                     ) as p_bar:
-                        for _ in range(int(total_size / Zotify.CONFIG.get_chunk_size()) + 2):
+                        while True:
+                        #for _ in range(int(total_size / Zotify.CONFIG.get_chunk_size()) + 2):
                             data = stream.input_stream.stream().read(Zotify.CONFIG.get_chunk_size())
                             p_bar.update(file.write(data))
                             downloaded += len(data)
+                            if data == b'':
+                                break
                             if Zotify.CONFIG.get_download_real_time():
                                 delta_real = time.time() - time_start
                                 delta_want = (downloaded / total_size) * (duration_ms/1000)