diff --git a/esign.cpp b/esign.cpp
index 5858830f..eb9ca468 100644
--- a/esign.cpp
+++ b/esign.cpp
@@ -101,9 +101,9 @@ void InvertibleESIGNFunction::GenerateRandom(RandomNumberGenerator &rng, const N
 		seed.resize(seedParam.size() + 4);
 		memcpy(seed + 4, seedParam.begin(), seedParam.size());
 
-		UnalignedPutWord(BIG_ENDIAN_ORDER, seed, (word32)0);
+		PutWord(false, BIG_ENDIAN_ORDER, seed, (word32)0);
 		m_p.GenerateRandom(rng, CombinedNameValuePairs(primeParam, MakeParameters("Seed", ConstByteArrayParameter(seed))));
-		UnalignedPutWord(BIG_ENDIAN_ORDER, seed, (word32)1);
+		PutWord(false, BIG_ENDIAN_ORDER, seed, (word32)1);
 		m_q.GenerateRandom(rng, CombinedNameValuePairs(primeParam, MakeParameters("Seed", ConstByteArrayParameter(seed))));
 	}
 	else
diff --git a/pssr.cpp b/pssr.cpp
index a4497059..c11cab5e 100644
--- a/pssr.cpp
+++ b/pssr.cpp
@@ -61,8 +61,8 @@ void PSSR_MEM_Base::ComputeMessageRepresentative(RandomNumberGenerator &rng,
 
 	// compute H = hash of M'
 	byte c[8];
-	UnalignedPutWord(BIG_ENDIAN_ORDER, c, (word32)SafeRightShift<29>(recoverableMessageLength));
-	UnalignedPutWord(BIG_ENDIAN_ORDER, c+4, word32(recoverableMessageLength << 3));
+	PutWord(false, BIG_ENDIAN_ORDER, c, (word32)SafeRightShift<29>(recoverableMessageLength));
+	PutWord(false, BIG_ENDIAN_ORDER, c+4, word32(recoverableMessageLength << 3));
 	hash.Update(c, 8);
 	hash.Update(recoverableMessage, recoverableMessageLength);
 	hash.Update(digest, digestSize);
@@ -126,8 +126,8 @@ DecodingResult PSSR_MEM_Base::RecoverMessageFromRepresentative(
 
 	// verify H = hash of M'
 	byte c[8];
-	UnalignedPutWord(BIG_ENDIAN_ORDER, c, (word32)SafeRightShift<29>(recoverableMessageLength));
-	UnalignedPutWord(BIG_ENDIAN_ORDER, c+4, word32(recoverableMessageLength << 3));
+	PutWord(false, BIG_ENDIAN_ORDER, c, (word32)SafeRightShift<29>(recoverableMessageLength));
+	PutWord(false, BIG_ENDIAN_ORDER, c+4, word32(recoverableMessageLength << 3));
 	hash.Update(c, 8);
 	hash.Update(recoverableMessage, recoverableMessageLength);
 	hash.Update(digest, digestSize);