diff --git a/assembly/__tests__/HistogramCountsKernels.test.ts b/assembly/__tests__/HistogramCountsKernels.test.ts
index 8ca9a7f..5b1676d 100644
--- a/assembly/__tests__/HistogramCountsKernels.test.ts
+++ b/assembly/__tests__/HistogramCountsKernels.test.ts
@@ -111,7 +111,7 @@ function checkEstablishTrackingValues<T, U>(h: Histogram<T, U>): void {
   expect<u64>(h.totalCount).equal(total);
   if (maxIndex >= 0) {
     expect<u64>(h.maxValue).equal(
-      h.highestEquivalentValue(h.valueFromIndex(maxIndex)) + h.unitMagnitudeMask
+      h.highestEquivalentValue(h.valueFromIndex(maxIndex)) | h.unitMagnitudeMask
     );
   } else {
     expect<u64>(h.maxValue).equal(0);
diff --git a/assembly/index.ts b/assembly/index.ts
index 4314cc9..bb8f252 100644
--- a/assembly/index.ts
+++ b/assembly/index.ts
@@ -474,53 +474,53 @@ export function addHistogram8to8(h: Histogram8, other: Histogram8): void { h.add
 export function addHistogram16to8(h: Histogram8, other: Histogram16): void { h.addHistogram16(other); }
 export function addHistogram32to8(h: Histogram8, other: Histogram32): void { h.addHistogram32(other); }
 export function addHistogram64to8(h: Histogram8, other: Histogram64): void { h.addHistogram64(other); }
-export function addPackedHistogramto8(h: Histogram8, other: PackedHistogram): void { h.addPackedHistogram(other); }
+export function addHistogramPackedto8(h: Histogram8, other: PackedHistogram): void { h.addPackedHistogram(other); }
 export function addHistogram8to16(h: Histogram16, other: Histogram8): void { h.addHistogram8(other); }
 export function addHistogram16to16(h: Histogram16, other: Histogram16): void { h.addHistogram16(other); }
 export function addHistogram32to16(h: Histogram16, other: Histogram32): void { h.addHistogram32(other); }
 export function addHistogram64to16(h: Histogram16, other: Histogram64): void { h.addHistogram64(other); }
-export function addPackedHistogramto16(h: Histogram16, other: PackedHistogram): void { h.addPackedHistogram(other); }
+export function addHistogramPackedto16(h: Histogram16, other: PackedHistogram): void { h.addPackedHistogram(other); }
 export function addHistogram8to32(h: Histogram32, other: Histogram8): void { h.addHistogram8(other); }
 export function addHistogram16to32(h: Histogram32, other: Histogram16): void { h.addHistogram16(other); }
 export function addHistogram32to32(h: Histogram32, other: Histogram32): void { h.addHistogram32(other); }
 export function addHistogram64to32(h: Histogram32, other: Histogram64): void { h.addHistogram64(other); }
-export function addPackedHistogramto32(h: Histogram32, other: PackedHistogram): void { h.addPackedHistogram(other); }
+export function addHistogramPackedto32(h: Histogram32, other: PackedHistogram): void { h.addPackedHistogram(other); }
 export function addHistogram8to64(h: Histogram64, other: Histogram8): void { h.addHistogram8(other); }
 export function addHistogram16to64(h: Histogram64, other: Histogram16): void { h.addHistogram16(other); }
 export function addHistogram32to64(h: Histogram64, other: Histogram32): void { h.addHistogram32(other); }
 export function addHistogram64to64(h: Histogram64, other: Histogram64): void { h.addHistogram64(other); }
-export function addPackedHistogramto64(h: Histogram64, other: PackedHistogram): void { h.addPackedHistogram(other); }
+export function addHistogramPackedto64(h: Histogram64, other: PackedHistogram): void { h.addPackedHistogram(other); }
 export function addHistogram8toPacked(h: PackedHistogram, other: Histogram8): void { h.addHistogram8(other); }
 export function addHistogram16toPacked(h: PackedHistogram, other: Histogram16): void { h.addHistogram16(other); }
 export function addHistogram32toPacked(h: PackedHistogram, other: Histogram32): void { h.addHistogram32(other); }
 export function addHistogram64toPacked(h: PackedHistogram, other: Histogram64): void { h.addHistogram64(other); }
-export function addPackedHistogramtoPacked(h: PackedHistogram, other: PackedHistogram): void { h.addPackedHistogram(other); }
+export function addHistogramPackedtoPacked(h: PackedHistogram, other: PackedHistogram): void { h.addPackedHistogram(other); }
 
 export function subtractHistogram8from8(h: Histogram8, other: Histogram8): void { h.subtractHistogram8(other); }
 export function subtractHistogram16from8(h: Histogram8, other: Histogram16): void { h.subtractHistogram16(other); }
 export function subtractHistogram32from8(h: Histogram8, other: Histogram32): void { h.subtractHistogram32(other); }
 export function subtractHistogram64from8(h: Histogram8, other: Histogram64): void { h.subtractHistogram64(other); }
-export function subtractPackedHistogramfrom8(h: Histogram8, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
+export function subtractHistogramPackedfrom8(h: Histogram8, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
 export function subtractHistogram8from16(h: Histogram16, other: Histogram8): void { h.subtractHistogram8(other); }
 export function subtractHistogram16from16(h: Histogram16, other: Histogram16): void { h.subtractHistogram16(other); }
 export function subtractHistogram32from16(h: Histogram16, other: Histogram32): void { h.subtractHistogram32(other); }
 export function subtractHistogram64from16(h: Histogram16, other: Histogram64): void { h.subtractHistogram64(other); }
-export function subtractPackedHistogramfrom16(h: Histogram16, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
+export function subtractHistogramPackedfrom16(h: Histogram16, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
 export function subtractHistogram8from32(h: Histogram32, other: Histogram8): void { h.subtractHistogram8(other); }
 export function subtractHistogram16from32(h: Histogram32, other: Histogram16): void { h.subtractHistogram16(other); }
 export function subtractHistogram32from32(h: Histogram32, other: Histogram32): void { h.subtractHistogram32(other); }
 export function subtractHistogram64from32(h: Histogram32, other: Histogram64): void { h.subtractHistogram64(other); }
-export function subtractPackedHistogramfrom32(h: Histogram32, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
+export function subtractHistogramPackedfrom32(h: Histogram32, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
 export function subtractHistogram8from64(h: Histogram64, other: Histogram8): void { h.subtractHistogram8(other); }
 export function subtractHistogram16from64(h: Histogram64, other: Histogram16): void { h.subtractHistogram16(other); }
 export function subtractHistogram32from64(h: Histogram64, other: Histogram32): void { h.subtractHistogram32(other); }
 export function subtractHistogram64from64(h: Histogram64, other: Histogram64): void { h.subtractHistogram64(other); }
-export function subtractPackedHistogramfrom64(h: Histogram64, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
+export function subtractHistogramPackedfrom64(h: Histogram64, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
 export function subtractHistogram8fromPacked(h: PackedHistogram, other: Histogram8): void { h.subtractHistogram8(other); }
 export function subtractHistogram16fromPacked(h: PackedHistogram, other: Histogram16): void { h.subtractHistogram16(other); }
 export function subtractHistogram32fromPacked(h: PackedHistogram, other: Histogram32): void { h.subtractHistogram32(other); }
 export function subtractHistogram64fromPacked(h: PackedHistogram, other: Histogram64): void { h.subtractHistogram64(other); }
-export function subtractPackedHistogramfromPacked(h: PackedHistogram, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
+export function subtractHistogramPackedfromPacked(h: PackedHistogram, other: PackedHistogram): void { h.subtractPackedHistogram(other); }
 
 export function addWhileCorrectingForCoordinatedOmission8(h: Histogram8, other: Histogram8, expectedIntervalBetweenValueSamples: f64): void { h.addWhileCorrectingForCoordinatedOmission(other, expectedIntervalBetweenValueSamples); }
 export function addWhileCorrectingForCoordinatedOmission16(h: Histogram16, other: Histogram16, expectedIntervalBetweenValueSamples: f64): void { h.addWhileCorrectingForCoordinatedOmission(other, expectedIntervalBetweenValueSamples); }
diff --git a/src/Histogram.spec.ts b/src/Histogram.spec.ts
index 0c741cd..307ab39 100644
--- a/src/Histogram.spec.ts
+++ b/src/Histogram.spec.ts
@@ -502,6 +502,40 @@ describe("Histogram add & substract", () => {
     expect(histogram.summary).toStrictEqual(before);
   });
 
+  const wasmBucketSizes = [8, 16, 32, 64, "packed"] as const;
+  wasmBucketSizes.forEach((thisSize) => {
+    wasmBucketSizes.forEach((otherSize) => {
+      it(`should add and subtract a WASM ${otherSize} histogram to/from a WASM ${thisSize} histogram`, () => {
+        // given
+        const histogram = build({
+          bitBucketSize: thisSize,
+          useWebAssembly: true,
+          numberOfSignificantValueDigits: 3,
+        });
+        const histogram2 = build({
+          bitBucketSize: otherSize,
+          useWebAssembly: true,
+          numberOfSignificantValueDigits: 3,
+        });
+        histogram.recordValueWithCount(100, 2);
+        histogram2.recordValueWithCount(100, 1);
+        histogram2.recordValueWithCount(42000, 1);
+        const before = histogram.summary;
+        // when
+        histogram.add(histogram2);
+        // then
+        expect(histogram.totalCount).toBe(4);
+        expect(histogram.maxValue).toBeGreaterThanOrEqual(42000);
+        // when
+        histogram.subtract(histogram2);
+        // then
+        expect(histogram.summary).toStrictEqual(before);
+        histogram.destroy();
+        histogram2.destroy();
+      });
+    });
+  });
+
   it("should update percentiles when another histogram of same characteristics is substracted", () => {
     // given
     const histogram = build({ numberOfSignificantValueDigits: 3 });