diff --git a/sampy/raknet/bitstream.py b/sampy/raknet/bitstream.py
index 0fcde01..5fb3e73 100644
--- a/sampy/raknet/bitstream.py
+++ b/sampy/raknet/bitstream.py
@@ -167,15 +167,8 @@ class Bitstream:
         return self
 
     def __iter__(self) -> Bitstream:
-        self._iter_index = 0
-        return self
-
-    def __next__(self) -> bool:
-        if self._iter_index >= self._bit_length:
-            raise StopIteration
-        bit = self[self._iter_index]
-        self._iter_index += 1
-        return bit
+        for i in range(len(self)):
+            yield self[i]
 
     def __repr__(self) -> str:
         return "<Bitstream addr:0x%012x offset:%d len:%d data:'%s'>" % (
diff --git a/tests/test_bitstream.py b/tests/test_bitstream.py
index b6750d2..1538c65 100644
--- a/tests/test_bitstream.py
+++ b/tests/test_bitstream.py
@@ -181,7 +181,7 @@ def test_add(
 ])
 def test_iter(init_values: List[Union[bool, List[bool], bytes, str, Bitstream]]):
     bitstream = Bitstream(*init_values)
-    assert len(iter(bitstream)) == len(bitstream)
+    assert len(list(bitstream)) == len(bitstream)
     for index, bit in enumerate(bitstream):
         assert bit == bitstream[index]