diff --git a/lib/Crypt/OpenPGP/PacketFactory.pm b/lib/Crypt/OpenPGP/PacketFactory.pm
index eba1ad8..d8828b3 100644
--- a/lib/Crypt/OpenPGP/PacketFactory.pm
+++ b/lib/Crypt/OpenPGP/PacketFactory.pm
@@ -55,7 +55,7 @@ sub parse {
     my($type, $len, $partial, $hdrlen, $b);
     do {
         ($type, $len, $partial, $hdrlen) = $class->_parse_header($buf);
-        $b = $buf->extract($len ? $len : $buf->length - $buf->offset);
+        $b = $buf->extract($len);
         return unless $type;
     } while !$find{$type};                 ## Skip