diff --git a/disk/vsa/vsa02.cpp b/disk/vsa/vsa02.cpp
index a0fc997..cfaaa89 100644
--- a/disk/vsa/vsa02.cpp
+++ b/disk/vsa/vsa02.cpp
@@ -9,7 +9,7 @@ VSA02::VSA02(uint8_t* const recordBytes)
 	constantIndex = *reinterpret_cast<uint16_t*>(recordBytes + 2);
 	flags = *reinterpret_cast<Flags*>(recordBytes + 4);
 	pieceCount = recordBytes[5];
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 6) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 6);
 	samples.insert(samples.end(), recordBytes + 14, recordBytes + 30);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 30);
 	doChecksum(recordBytes);
diff --git a/disk/vsa/vsa03.cpp b/disk/vsa/vsa03.cpp
index e7a8f6b..9862203 100644
--- a/disk/vsa/vsa03.cpp
+++ b/disk/vsa/vsa03.cpp
@@ -8,7 +8,7 @@ VSA03::VSA03(uint8_t* const recordBytes)
 	setType(VSA::Type::AA03);
 	eventType = static_cast<EventType>(*reinterpret_cast<uint16_t*>(recordBytes + 2));
 	eventData = *reinterpret_cast<uint16_t*>(recordBytes + 4);
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 6) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 6);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 14);
 	doChecksum(recordBytes);
 }
diff --git a/disk/vsa/vsa04.cpp b/disk/vsa/vsa04.cpp
index 8e14a39..127f2ea 100644
--- a/disk/vsa/vsa04.cpp
+++ b/disk/vsa/vsa04.cpp
@@ -8,7 +8,7 @@ VSA04::VSA04(uint8_t* const recordBytes)
 	setType(VSA::Type::AA04);
 	flags = *reinterpret_cast<Flags*>(recordBytes + 2);
 	partitionIndex = *reinterpret_cast<uint16_t*>(recordBytes + 4);
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 6) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 6);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 14);
 	doChecksum(recordBytes);
 }
diff --git a/disk/vsa/vsa05.cpp b/disk/vsa/vsa05.cpp
index 32b61df..215ae9f 100644
--- a/disk/vsa/vsa05.cpp
+++ b/disk/vsa/vsa05.cpp
@@ -8,7 +8,7 @@ VSA05::VSA05(uint8_t* const recordBytes)
 	setType(VSA::Type::AA05);
 	errorType = static_cast<ErrorType>(*reinterpret_cast<uint16_t*>(recordBytes + 2));
 	errorNetwork = *reinterpret_cast<uint16_t*>(recordBytes + 4);
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 6) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 6);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 14);
 }
 
diff --git a/disk/vsa/vsa06.cpp b/disk/vsa/vsa06.cpp
index 7b9194c..ff02937 100644
--- a/disk/vsa/vsa06.cpp
+++ b/disk/vsa/vsa06.cpp
@@ -9,7 +9,7 @@ VSA06::VSA06(uint8_t* const recordBytes)
 	savedSectors.insert(savedSectors.end(), reinterpret_cast<uint32_t*>(recordBytes + 2), reinterpret_cast<uint32_t*>(recordBytes + 18));
 	error = *reinterpret_cast<uint16_t*>(recordBytes + 18);
 	savedSectorsHigh = *reinterpret_cast<uint16_t*>(recordBytes + 20);
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 30);
 	doChecksum(recordBytes);
 }
diff --git a/disk/vsa/vsa07.cpp b/disk/vsa/vsa07.cpp
index 71673ba..26c17c4 100644
--- a/disk/vsa/vsa07.cpp
+++ b/disk/vsa/vsa07.cpp
@@ -9,7 +9,7 @@ VSA07::VSA07(uint8_t* const recordBytes)
 	lastSector = *reinterpret_cast<uint32_t*>(recordBytes + 2);
 	currentSector = *reinterpret_cast<uint32_t*>(recordBytes + 6);
 	reserved.insert(reserved.end(), recordBytes + 10, recordBytes + 22);
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 30);
 	doChecksum(recordBytes);
 }
diff --git a/disk/vsa/vsa08.cpp b/disk/vsa/vsa08.cpp
index aa1c381..1c92b09 100644
--- a/disk/vsa/vsa08.cpp
+++ b/disk/vsa/vsa08.cpp
@@ -8,7 +8,7 @@ VSA08::VSA08(uint8_t* const recordBytes)
 	setType(VSA::Type::AA08);
 	troubleSramCount.insert(troubleSramCount.end(), recordBytes + 2, recordBytes + 6);
 	troubleSectors.insert(troubleSectors.end(), reinterpret_cast<uint32_t*>(recordBytes + 6), reinterpret_cast<uint32_t*>(recordBytes + 22));
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 30);
 	doChecksum(recordBytes);
 }
diff --git a/disk/vsa/vsa09.cpp b/disk/vsa/vsa09.cpp
index 9425c1e..939544c 100644
--- a/disk/vsa/vsa09.cpp
+++ b/disk/vsa/vsa09.cpp
@@ -16,7 +16,7 @@ VSA09::VSA09(uint8_t* const recordBytes)
 	reserved0.insert(reserved0.end(), recordBytes + 12, recordBytes + 18);
 	hardwareID = static_cast<HardwareID>(recordBytes[18]);
 	reserved1.insert(reserved1.end(), recordBytes + 19, recordBytes + 22);
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 30);
 	doChecksum(recordBytes);
 }
diff --git a/disk/vsa/vsa0b.cpp b/disk/vsa/vsa0b.cpp
index fdb2537..80390d3 100644
--- a/disk/vsa/vsa0b.cpp
+++ b/disk/vsa/vsa0b.cpp
@@ -11,7 +11,7 @@ VSA0B::VSA0B(uint8_t* const recordBytes)
 {
 	setType(VSA::Type::AA0B);
 	captureBitfield = reinterpret_cast<uint16_t*>(recordBytes)[1];
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 20) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 20);
 	reserved = recordBytes[28];
 	checksum = reinterpret_cast<uint16_t*>(recordBytes)[15];
 	doChecksum(recordBytes);
@@ -30,8 +30,8 @@ void VSA0B::doChecksum(uint8_t* recordBytes)
 bool VSA0B::filter(const std::shared_ptr<VSAMessageReadFilter> filter)
 {
 	if((filter->captureBitfield != captureBitfield && filter->captureBitfield != UINT16_MAX) ||
-		getICSTimestampFromTimepoint(filter->readRange.first) > timestamp ||
-		getICSTimestampFromTimepoint(filter->readRange.second) < timestamp) {
+		getICSTimestampFromTimepoint(filter->readRange.first) > getTimestamp() ||
+		getICSTimestampFromTimepoint(filter->readRange.second) < getTimestamp()) {
 		return false;
 	}
 	return true;
diff --git a/disk/vsa/vsa0c.cpp b/disk/vsa/vsa0c.cpp
index 1f3c33e..f90a8c5 100644
--- a/disk/vsa/vsa0c.cpp
+++ b/disk/vsa/vsa0c.cpp
@@ -10,7 +10,7 @@ VSA0C::VSA0C(uint8_t* const recordBytes)
 	audioPreamble = recordBytes[4];
 	audioHeader = recordBytes[5];
 	pcmData.insert(pcmData.end(), recordBytes + 6, recordBytes + 20);
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 20) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 20);
 	vNetBitfield = *reinterpret_cast<VSA0C::VNet*>(recordBytes + 28);
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 30);
 	doChecksum(recordBytes);
diff --git a/disk/vsa/vsa0d.cpp b/disk/vsa/vsa0d.cpp
index 22a7048..4aac3e7 100644
--- a/disk/vsa/vsa0d.cpp
+++ b/disk/vsa/vsa0d.cpp
@@ -76,8 +76,8 @@ void VSA0DFirst::reorderPayload(std::vector<uint8_t>& secondPayload)
 bool VSA0DFirst::filter(const std::shared_ptr<VSAMessageReadFilter> filter)
 {
 	if((filter->captureBitfield != captureBitfield && filter->captureBitfield != UINT16_MAX) ||
-		getICSTimestampFromTimepoint(filter->readRange.first) > timestamp ||
-		getICSTimestampFromTimepoint(filter->readRange.second) < timestamp) {
+		getICSTimestampFromTimepoint(filter->readRange.first) > getTimestamp() ||
+		getICSTimestampFromTimepoint(filter->readRange.second) < getTimestamp()) {
 		return false;
 	}
 	return true;
diff --git a/disk/vsa/vsa0e.cpp b/disk/vsa/vsa0e.cpp
index ac61b81..6610fd4 100644
--- a/disk/vsa/vsa0e.cpp
+++ b/disk/vsa/vsa0e.cpp
@@ -66,8 +66,8 @@ void VSA0EFirst::reservePacketData(std::shared_ptr<Packet>& packet) const
 bool VSA0EFirst::filter(const std::shared_ptr<VSAMessageReadFilter> filter)
 {
 	if((filter->captureBitfield != captureBitfield && filter->captureBitfield != UINT16_MAX) ||
-		getICSTimestampFromTimepoint(filter->readRange.first) > timestamp ||
-		getICSTimestampFromTimepoint(filter->readRange.second) < timestamp) {
+		getICSTimestampFromTimepoint(filter->readRange.first) > getTimestamp() ||
+		getICSTimestampFromTimepoint(filter->readRange.second) < getTimestamp()) {
 		return false;
 	}
 	return true;
diff --git a/disk/vsa/vsa0f.cpp b/disk/vsa/vsa0f.cpp
index 72254d6..ef14fd2 100644
--- a/disk/vsa/vsa0f.cpp
+++ b/disk/vsa/vsa0f.cpp
@@ -78,8 +78,8 @@ void VSA0FFirst::reservePacketData(std::shared_ptr<Packet>& packet) const
 bool VSA0FFirst::filter(const std::shared_ptr<VSAMessageReadFilter> filter)
 {
 	if(filter->captureBitfield != captureBitfield ||
-		getICSTimestampFromTimepoint(filter->readRange.first) > timestamp ||
-		getICSTimestampFromTimepoint(filter->readRange.second) < timestamp) {
+		getICSTimestampFromTimepoint(filter->readRange.first) > getTimestamp() ||
+		getICSTimestampFromTimepoint(filter->readRange.second) < getTimestamp()) {
 		return false;
 	}
 	return true;
diff --git a/disk/vsa/vsa6a.cpp b/disk/vsa/vsa6a.cpp
index b91c956..62f3f9f 100644
--- a/disk/vsa/vsa6a.cpp
+++ b/disk/vsa/vsa6a.cpp
@@ -16,7 +16,7 @@ VSA6A::VSA6A(uint8_t* const recordBytes)
 	sequenceNum = *reinterpret_cast<uint32_t*>(recordBytes + 34);
 	totalSectors = *reinterpret_cast<uint32_t*>(recordBytes + 38);
 	reserved = *reinterpret_cast<uint32_t*>(recordBytes + 42);
-	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 46) & UINT63_MAX;
+	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 46);
 	timestampSum = *reinterpret_cast<uint16_t*>(recordBytes + 54);
 	data.insert(data.end(), recordBytes + 56, recordBytes + 508);
 	checksum = *reinterpret_cast<uint32_t*>(recordBytes + 508);
diff --git a/include/icsneo/disk/vsa/vsa02.h b/include/icsneo/disk/vsa/vsa02.h
index 2e019a5..ae73fee 100644
--- a/include/icsneo/disk/vsa/vsa02.h
+++ b/include/icsneo/disk/vsa/vsa02.h
@@ -24,7 +24,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa03.h b/include/icsneo/disk/vsa/vsa03.h
index ea710ad..88ef1de 100644
--- a/include/icsneo/disk/vsa/vsa03.h
+++ b/include/icsneo/disk/vsa/vsa03.h
@@ -24,7 +24,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa04.h b/include/icsneo/disk/vsa/vsa04.h
index 2f4f4f4..7843887 100644
--- a/include/icsneo/disk/vsa/vsa04.h
+++ b/include/icsneo/disk/vsa/vsa04.h
@@ -24,7 +24,7 @@ public:
 	 *
 	 * @return Timestamp of this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa05.h b/include/icsneo/disk/vsa/vsa05.h
index 949c91a..49d05c3 100644
--- a/include/icsneo/disk/vsa/vsa05.h
+++ b/include/icsneo/disk/vsa/vsa05.h
@@ -24,7 +24,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa06.h b/include/icsneo/disk/vsa/vsa06.h
index ae0a625..3524e6d 100644
--- a/include/icsneo/disk/vsa/vsa06.h
+++ b/include/icsneo/disk/vsa/vsa06.h
@@ -26,7 +26,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa07.h b/include/icsneo/disk/vsa/vsa07.h
index 2278ee4..57d5fd7 100644
--- a/include/icsneo/disk/vsa/vsa07.h
+++ b/include/icsneo/disk/vsa/vsa07.h
@@ -26,7 +26,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa08.h b/include/icsneo/disk/vsa/vsa08.h
index 18c76a7..ae0f619 100644
--- a/include/icsneo/disk/vsa/vsa08.h
+++ b/include/icsneo/disk/vsa/vsa08.h
@@ -24,7 +24,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa09.h b/include/icsneo/disk/vsa/vsa09.h
index 7aeff02..8652a1c 100644
--- a/include/icsneo/disk/vsa/vsa09.h
+++ b/include/icsneo/disk/vsa/vsa09.h
@@ -24,7 +24,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa0b.h b/include/icsneo/disk/vsa/vsa0b.h
index a32ea51..700c0ad 100644
--- a/include/icsneo/disk/vsa/vsa0b.h
+++ b/include/icsneo/disk/vsa/vsa0b.h
@@ -34,7 +34,7 @@ public:
 	 *
 	 * @return Timestamp of this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa0c.h b/include/icsneo/disk/vsa/vsa0c.h
index 116b44b..7945d51 100644
--- a/include/icsneo/disk/vsa/vsa0c.h
+++ b/include/icsneo/disk/vsa/vsa0c.h
@@ -26,7 +26,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa0d.h b/include/icsneo/disk/vsa/vsa0d.h
index 208953b..ef44a41 100644
--- a/include/icsneo/disk/vsa/vsa0d.h
+++ b/include/icsneo/disk/vsa/vsa0d.h
@@ -57,7 +57,7 @@ public:
 	 *
 	 * @return The timestamp of this record
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 	/**
 	 * Reorder bytes in the payload between this record and the second record in the sequence. The bytes are reordered to allow
diff --git a/include/icsneo/disk/vsa/vsa0e.h b/include/icsneo/disk/vsa/vsa0e.h
index 4b3d556..6b555ed 100644
--- a/include/icsneo/disk/vsa/vsa0e.h
+++ b/include/icsneo/disk/vsa/vsa0e.h
@@ -57,7 +57,7 @@ public:
 	 *
 	 * @return The timestamp of this record
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 	/**
 	 * Reorder bytes in the payload between this record and the second record in the sequence. The bytes are reordered to allow
diff --git a/include/icsneo/disk/vsa/vsa0f.h b/include/icsneo/disk/vsa/vsa0f.h
index 98f97a0..a61d73f 100644
--- a/include/icsneo/disk/vsa/vsa0f.h
+++ b/include/icsneo/disk/vsa/vsa0f.h
@@ -57,7 +57,7 @@ public:
 	 *
 	 * @return The timestamp of this record
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**
diff --git a/include/icsneo/disk/vsa/vsa6a.h b/include/icsneo/disk/vsa/vsa6a.h
index c658d07..5ec265b 100644
--- a/include/icsneo/disk/vsa/vsa6a.h
+++ b/include/icsneo/disk/vsa/vsa6a.h
@@ -24,7 +24,7 @@ public:
 	 *
 	 * @return The timestamp for this record in 25 nanosecond ticks since January 1, 2007
 	 */
-	uint64_t getTimestamp() override { return timestamp; }
+	uint64_t getTimestamp() override { return timestamp & UINT63_MAX; }
 
 private:
 	/**