diff --git a/FHE/FHE_Keys.cpp b/FHE/FHE_Keys.cpp
index 2f5a90201..b7ba184ce 100644
--- a/FHE/FHE_Keys.cpp
+++ b/FHE/FHE_Keys.cpp
@@ -402,7 +402,7 @@ template Ciphertext FHE_PK::encrypt(const Plaintext_<P2Data>& mess) const;
 
 template void FHE_PK::encrypt(Ciphertext& c, const vector<int>& mess,
     const Random_Coins& rc) const;
-template void FHE_PK::encrypt(Ciphertext& c, const vector<fixint<2>>& mess,
+template void FHE_PK::encrypt(Ciphertext& c, const vector<fixint<GFP_MOD_SZ>>& mess,
     const Random_Coins& rc) const;
 
 template Plaintext_<FFT_Data> FHE_SK::decrypt(const Ciphertext& c,
diff --git a/Math/modp.hpp b/Math/modp.hpp
index 9a35170ab..47fcbe125 100644
--- a/Math/modp.hpp
+++ b/Math/modp.hpp
@@ -82,7 +82,7 @@ bool isOne(const modp_<L>& x,const Zp_Data& ZpD)
     }
   else
     { if (x.x[0]!=1) { return false; }
-      for (int i=1; i<ZpD.t; i++)
+      for (int i=1; i<min(ZpD.t, L); i++)
 	{ if (x.x[i]!=0) { return false; } }
     }
   return true;