diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
index 2cd93ddc7..ee7a358c6 100644
--- a/crypto/bn/bn_gf2m.c
+++ b/crypto/bn/bn_gf2m.c
@@ -646,6 +646,8 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
 err:
 #ifdef BN_DEBUG /* BN_CTX_end would complain about the expanded form */
         bn_correct_top(c);
+        bn_correct_top(u);
+        bn_correct_top(v);
 #endif
   	BN_CTX_end(ctx);
 	return ret;