diff --git a/src/main/java/com/dynatrace/hash4j/hashing/AbstractWyhashFinal.java b/src/main/java/com/dynatrace/hash4j/hashing/AbstractWyhashFinal.java
index 8a808a97..17cd0e86 100644
--- a/src/main/java/com/dynatrace/hash4j/hashing/AbstractWyhashFinal.java
+++ b/src/main/java/com/dynatrace/hash4j/hashing/AbstractWyhashFinal.java
@@ -283,14 +283,13 @@ public HashStream64 copy() {
 
     @Override
     public HashStream64 putByte(byte v) {
-      buffer[offset] = v;
-      offset += 1;
-      byteCount += 1;
-      if (offset > 48) {
+      if (offset >= 48) {
         offset -= 48;
         processBuffer();
-        buffer[0] = buffer[48];
       }
+      buffer[offset] = v;
+      offset += 1;
+      byteCount += 1;
       return this;
     }
 
@@ -353,23 +352,24 @@ public HashStream64 putBytes(byte[] b, int off, int len) {
       if (len > x) {
         System.arraycopy(b, off, buffer, offset, x);
         processBuffer();
-        int lenOrig = len;
         len -= x;
         off += x;
-        while (len > 48) {
-          long b0 = getLong(b, off);
-          long b1 = getLong(b, off + 8);
-          long b2 = getLong(b, off + 16);
-          long b3 = getLong(b, off + 24);
-          long b4 = getLong(b, off + 32);
-          long b5 = getLong(b, off + 40);
-          processBuffer(b0, b1, b2, b3, b4, b5);
-          off += 48;
-          len -= 48;
-        }
-        int y = 16 - len;
-        if (lenOrig > 48 && y > 0) {
-          System.arraycopy(b, off - y, buffer, 32 + len, y);
+        if (len > 48) {
+          do {
+            long b0 = getLong(b, off);
+            long b1 = getLong(b, off + 8);
+            long b2 = getLong(b, off + 16);
+            long b3 = getLong(b, off + 24);
+            long b4 = getLong(b, off + 32);
+            long b5 = getLong(b, off + 40);
+            processBuffer(b0, b1, b2, b3, b4, b5);
+            off += 48;
+            len -= 48;
+          } while (len > 48);
+          if (len < 16) {
+            int y = 16 - len;
+            System.arraycopy(b, off - y, buffer, 32 + len, y);
+          }
         }
         offset = 0;
       }