diff --git a/src/packet/clone.js b/src/packet/clone.js
index 17c89867..c61b0f0a 100644
--- a/src/packet/clone.js
+++ b/src/packet/clone.js
@@ -104,7 +104,7 @@ export function parseClonedPackets(options, method) {
   if (options.key) {
     options.key = packetlistCloneToKey(options.key);
   }
-  if (options.message && (method === 'sign' || method === 'verify')) { // sign and verify support only CleartextMessage
+  if (options.message && options.message.signature) {
     options.message = packetlistCloneToCleartextMessage(options.message);
   } else if (options.message) {
     options.message = packetlistCloneToMessage(options.message);