diff --git a/src/proto/server/request.rs b/src/proto/server/request.rs
index a8f87d1..3ed18b7 100644
--- a/src/proto/server/request.rs
+++ b/src/proto/server/request.rs
@@ -26,7 +26,7 @@ macro_rules! try_to_packet {
     ($code: ident, $request:ident) => {
         {
             let mut packet = MutPacket::new($code);
-            try!($request.write_to_packet(&mut packet));
+            try!(packet.write_value($request));
             Ok(packet)
         }
     }
diff --git a/src/proto/server/response.rs b/src/proto/server/response.rs
index f471635..9e1cfb6 100644
--- a/src/proto/server/response.rs
+++ b/src/proto/server/response.rs
@@ -33,9 +33,9 @@ pub enum ServerResponse {
 }
 
 macro_rules! try_read_from_packet {
-    ($struct_name:ident, $packet:ident) => {
-        ServerResponse::$struct_name(
-            try!($struct_name::read_from_packet($packet))
+    ($variant:ident, $packet:ident) => {
+        ServerResponse::$variant(
+            try!($packet.read_value())
         )
     }
 }