diff --git a/inc/CryptX_PK_Ed25519.xs.inc b/inc/CryptX_PK_Ed25519.xs.inc
index bdbc269..993c4f7 100644
--- a/inc/CryptX_PK_Ed25519.xs.inc
+++ b/inc/CryptX_PK_Ed25519.xs.inc
@@ -11,7 +11,6 @@
         if (!RETVAL) croak("FATAL: Newz failed");
         RETVAL->initialized = 0;
         RETVAL->pindex = find_prng("chacha20");
-        RETVAL->key.type = -1;
         if (RETVAL->pindex == -1) {
           Safefree(RETVAL);
           croak("FATAL: find_prng('chacha20') failed");
@@ -46,7 +45,7 @@
         STRLEN data_len=0;
 
         data = (unsigned char *)SvPVbyte(key_data, data_len);
-        self->key.type = -1;
+        self->initialized = 0;
         rv = ed25519_import(data, (unsigned long)data_len, &self->key);
         if (rv != CRYPT_OK) croak("FATAL: ed25519_import failed: %s", error_to_string(rv));
         self->initialized = 1;
@@ -65,7 +64,7 @@
         if (SvOK(passwd)) {
           pwd = (unsigned char *)SvPVbyte(passwd, pwd_len);
         }
-        self->key.type = -1;
+        self->initialized = 0;
         rv = ed25519_import_pkcs8(data, (unsigned long)data_len, pwd, (unsigned long)pwd_len, &self->key);
         if (rv != CRYPT_OK) croak("FATAL: ed25519_import_pkcs8 failed: %s", error_to_string(rv));
         self->initialized = 1;
@@ -81,7 +80,7 @@
         STRLEN data_len=0;
 
         data = (unsigned char *)SvPVbyte(key_data, data_len);
-        self->key.type = -1;
+        self->initialized = 0;
         rv = ed25519_import_x509(data, (unsigned long)data_len, &self->key);
         if (rv != CRYPT_OK) croak("FATAL: ed25519_import_x509 failed: %s", error_to_string(rv));
         self->initialized = 1;
@@ -116,7 +115,7 @@
 int
 is_private(Crypt::PK::Ed25519 self)
     CODE:
-        if (self->initialized == 0 || self->key.type == -1) XSRETURN_UNDEF;
+        if (self->initialized == 0) XSRETURN_UNDEF;
         RETVAL = (self->key.type == PK_PRIVATE) ? 1 : 0;
     OUTPUT:
         RETVAL
diff --git a/inc/CryptX_PK_X25519.xs.inc b/inc/CryptX_PK_X25519.xs.inc
index 6eb6e00..e23656a 100644
--- a/inc/CryptX_PK_X25519.xs.inc
+++ b/inc/CryptX_PK_X25519.xs.inc
@@ -11,7 +11,6 @@
         if (!RETVAL) croak("FATAL: Newz failed");
         RETVAL->initialized = 0;
         RETVAL->pindex = find_prng("chacha20");
-        RETVAL->key.type = -1;
         if (RETVAL->pindex == -1) {
           Safefree(RETVAL);
           croak("FATAL: find_prng('chacha20') failed");
@@ -46,7 +45,7 @@
         STRLEN data_len=0;
 
         data = (unsigned char *)SvPVbyte(key_data, data_len);
-        self->key.type = -1;
+        self->initialized = 0;
         rv = x25519_import(data, (unsigned long)data_len, &self->key);
         if (rv != CRYPT_OK) croak("FATAL: x25519_import failed: %s", error_to_string(rv));
         self->initialized = 1;
@@ -65,7 +64,7 @@
         if (SvOK(passwd)) {
           pwd = (unsigned char *)SvPVbyte(passwd, pwd_len);
         }
-        self->key.type = -1;
+        self->initialized = 0;
         rv = x25519_import_pkcs8(data, (unsigned long)data_len, pwd, (unsigned long)pwd_len, &self->key);
         if (rv != CRYPT_OK) croak("FATAL: x25519_import_pkcs8 failed: %s", error_to_string(rv));
         self->initialized = 1;
@@ -81,7 +80,7 @@
         STRLEN data_len=0;
 
         data = (unsigned char *)SvPVbyte(key_data, data_len);
-        self->key.type = -1;
+        self->initialized = 0;
         rv = x25519_import_x509(data, (unsigned long)data_len, &self->key);
         if (rv != CRYPT_OK) croak("FATAL: x25519_import_x509 failed: %s", error_to_string(rv));
         self->initialized = 1;
@@ -116,7 +115,7 @@
 int
 is_private(Crypt::PK::X25519 self)
     CODE:
-        if (self->initialized == 0 || self->key.type == -1) XSRETURN_UNDEF;
+        if (self->initialized == 0) XSRETURN_UNDEF;
         RETVAL = (self->key.type == PK_PRIVATE) ? 1 : 0;
     OUTPUT:
         RETVAL