diff --git a/src/data/message.rs b/src/data/message.rs
index 022e469..7039608 100644
--- a/src/data/message.rs
+++ b/src/data/message.rs
@@ -48,6 +48,7 @@ impl Message {
             ret.push_str(" :");
             ret.push_str(suffix[]);
         }
+        ret.push_str("\r\n");
         ret
     }
 }
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 37184a1..05a3f7c 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -72,8 +72,7 @@ impl<'a, T, U> IrcServer<'a, T, U> where T: IrcWriter, U: IrcReader {
 
     fn handle_message(&self, message: &Message) {
         if message.command[] == "PING" {
-            self.send(PONG(message.args[0][], None)).unwrap();
-            println!("PING! PONG!");
+            self.send(PONG(message.suffix.as_ref().unwrap()[], None)).unwrap();
         }
         /* TODO: implement more message handling */
     }