diff --git a/proto/frontend/src/packet_io_mgr.cpp b/proto/frontend/src/packet_io_mgr.cpp
index 4ccd11a4..3918df8e 100644
--- a/proto/frontend/src/packet_io_mgr.cpp
+++ b/proto/frontend/src/packet_io_mgr.cpp
@@ -182,6 +182,10 @@ class PacketInMutate {
       generic_extract(pkt, bit_offset, bitwidth, buffer.data());
       bit_offset += (bitwidth % 8);
       pkt += (bitwidth / 8);
+      if (bit_offset >= 8) {
+          pkt += (bit_offset / 8);
+          bit_offset = bit_offset % 8;
+      }
       metadata->set_value(bytestring_pi_to_p4rt(buffer.data(), buffer.size()));
     }
     return true;
diff --git a/proto/tests/test_proto_fe_packet_io.cpp b/proto/tests/test_proto_fe_packet_io.cpp
index 914ef939..fc59ca71 100644
--- a/proto/tests/test_proto_fe_packet_io.cpp
+++ b/proto/tests/test_proto_fe_packet_io.cpp
@@ -199,9 +199,9 @@ struct ValueIterator {
 class DeviceMgrPacketIOMetadataTest : public DeviceMgrPacketIOTest {
  public:
   static constexpr int num = 3;
-  static constexpr int bw1 = 2;
-  static constexpr int bw2 = 9;
-  static constexpr int bw3 = 5;
+  static constexpr int bw1 = 7;
+  static constexpr int bw2 = 7;
+  static constexpr int bw3 = 2;
   using VType = std::array<int, num>;
 
  protected: