diff --git a/src/main/java/com/limechain/polkaj/reader/ScaleCodecReader.java b/src/main/java/com/limechain/polkaj/reader/ScaleCodecReader.java
index 6348a2310..7ab6c8d3c 100644
--- a/src/main/java/com/limechain/polkaj/reader/ScaleCodecReader.java
+++ b/src/main/java/com/limechain/polkaj/reader/ScaleCodecReader.java
@@ -29,7 +29,7 @@ public ScaleCodecReader(byte[] source) {
      * @return true if has more elements
      */
     public boolean hasNext() {
-        return true;//pos < source.length;
+        return pos < source.length;
     }
 
     /**