diff --git a/lib/key_generators/ec_key_generator.dart b/lib/key_generators/ec_key_generator.dart
index a0224cd..2689ab4 100644
--- a/lib/key_generators/ec_key_generator.dart
+++ b/lib/key_generators/ec_key_generator.dart
@@ -34,7 +34,7 @@
   }
 
   @override
-  AsymmetricKeyPair generateKeyPair() {
+  AsymmetricKeyPair<ECPublicKey, ECPrivateKey> generateKeyPair() {
     var n = _params.n;
     var nBitLength = n.bitLength;
     BigInt? d;
diff --git a/lib/key_generators/rsa_key_generator.dart b/lib/key_generators/rsa_key_generator.dart
index dc84dac..9b3af75 100644
--- a/lib/key_generators/rsa_key_generator.dart
+++ b/lib/key_generators/rsa_key_generator.dart
@@ -41,7 +41,7 @@
   }
 
   @override
-  AsymmetricKeyPair generateKeyPair() {
+  AsymmetricKeyPair<RSAPublicKey, RSAPrivateKey> generateKeyPair() {
     BigInt p, q, n, e;
 
     // p and q values should have a length of half the strength in bits
diff --git a/tutorials/examples/rsa-demo.dart b/tutorials/examples/rsa-demo.dart
index d509ecc..a4556c1 100644
--- a/tutorials/examples/rsa-demo.dart
+++ b/tutorials/examples/rsa-demo.dart
@@ -55,8 +55,8 @@
 
   // Cast the generated key pair into the RSA key types
 
-  final myPublic = pair.publicKey as RSAPublicKey;
-  final myPrivate = pair.privateKey as RSAPrivateKey;
+  final myPublic = pair.publicKey;
+  final myPrivate = pair.privateKey;
 
   // The RSA numbers will always satisfy these properties