diff --git a/emesh/hdl/emesh2packet.v b/emesh/hdl/emesh2packet.v
index 82f8e7b..b856858 100644
--- a/emesh/hdl/emesh2packet.v
+++ b/emesh/hdl/emesh2packet.v
@@ -47,17 +47,17 @@ module emesh2packet(/*AUTOARG*/
    generate   
       if(AW==64)
 	begin : packet64
-	   assign packet_out[39:8]    = dstaddr_out[AW/2-1:0];
-	   assign packet_out[71:40]   = data_out[AW/2-1:0];
-	   assign packet_out[103:72]  = srcaddr_out[AW/2-1:0];   
-	   assign packet_out[135:104] = srcaddr_out[AW-1:AW/2];
-	   assign packet_out[167:136] = dstaddr_out[AW-1:AW/2];
+	   assign packet_out[39:8]    = dstaddr_out[31:0];
+	   assign packet_out[71:40]   = data_out[31:0];
+	   assign packet_out[103:72]  = srcaddr_out[31:0];   
+	   assign packet_out[135:104] = srcaddr_out[63:32];
+	   assign packet_out[167:136] = dstaddr_out[63:32];
 	end
       else
 	begin : packet32
-	   assign packet_out[39:8]    = dstaddr_out[AW-1:0];
-	   assign packet_out[71:40]   = data_out[AW-1:0];
-	   assign packet_out[103:72]  = srcaddr_out[AW-1:0];
+	   assign packet_out[39:8]    = dstaddr_out[31:0];
+	   assign packet_out[71:40]   = data_out[31:0];
+	   assign packet_out[103:72]  = srcaddr_out[31:0];
 	end      
    endgenerate