diff --git a/src/main/java/com/mykola2312/retracker/bencode/BValueIterator.java b/src/main/java/com/mykola2312/retracker/bencode/BValueIterator.java
index 7b65eaa..ac2b0df 100644
--- a/src/main/java/com/mykola2312/retracker/bencode/BValueIterator.java
+++ b/src/main/java/com/mykola2312/retracker/bencode/BValueIterator.java
@@ -9,11 +9,12 @@ public class BValueIterator implements Iterator<BValue> {
 	}
 	
 	public boolean hasNext() {
-		return node != null && node.getNext() != null;
+		return node != null;
 	}
 	
 	public BValue next() {
-		node = node.getNext();
-		return node;
+		BValue current = node;
+		node = current.getNext();
+		return current;
 	}
 }