diff --git a/src/ICS26Router.sol b/src/ICS26Router.sol
index dcdec87c..653de6ba 100644
--- a/src/ICS26Router.sol
+++ b/src/ICS26Router.sol
@@ -107,7 +107,8 @@ contract ICS26Router is IICS26Router, IBCStore, Ownable, IICS26RouterErrors, Ree
         ILightClientMsgs.MsgMembership memory membershipMsg = ILightClientMsgs.MsgMembership({
             proof: msg_.proofCommitment,
             proofHeight: msg_.proofHeight,
-            kvPair: ILightClientMsgs.KVPair({ path: commitmentPath, value: abi.encodePacked(commitmentBz) })
+            path: commitmentPath,
+            value: abi.encodePacked(commitmentBz)
         });
 
         ics02Client.getClient(msg_.packet.destChannel).membership(membershipMsg);
@@ -153,7 +154,8 @@ contract ICS26Router is IICS26Router, IBCStore, Ownable, IICS26RouterErrors, Ree
         ILightClientMsgs.MsgMembership memory membershipMsg = ILightClientMsgs.MsgMembership({
             proof: msg_.proofAcked,
             proofHeight: msg_.proofHeight,
-            kvPair: ILightClientMsgs.KVPair({ path: commitmentPath, value: abi.encodePacked(commitmentBz) })
+            path: commitmentPath,
+            value: abi.encodePacked(commitmentBz)
         });
 
         ics02Client.getClient(msg_.packet.sourceChannel).membership(membershipMsg);
@@ -191,7 +193,8 @@ contract ICS26Router is IICS26Router, IBCStore, Ownable, IICS26RouterErrors, Ree
         ILightClientMsgs.MsgMembership memory nonMembershipMsg = ILightClientMsgs.MsgMembership({
             proof: msg_.proofTimeout,
             proofHeight: msg_.proofHeight,
-            kvPair: ILightClientMsgs.KVPair({ path: receiptPath, value: bytes("") })
+            path: receiptPath,
+            value: bytes("")
         });
 
         uint32 counterpartyTimestamp = ics02Client.getClient(msg_.packet.sourceChannel).membership(nonMembershipMsg);