diff --git a/client.ml b/client.ml
index 6fb2a75..726df3d 100644
--- a/client.ml
+++ b/client.ml
@@ -97,7 +97,8 @@ let handle_input cli =
       | [] ->
 	  ()
       | [leftover] ->
-	  String.blit leftover 0 cli.ibuf 0 (String.length leftover)
+	  cli.ibuf_len := (String.length leftover);
+	  String.blit leftover 0 cli.ibuf 0 !(cli.ibuf_len)
       | line :: tl ->
 	  let parsed = Command.from_string line in
 	    !(cli.handle_command) cli parsed;
diff --git a/tests.ml b/tests.ml
index 04ac176..4b511bb 100644
--- a/tests.ml
+++ b/tests.ml
@@ -27,9 +27,7 @@ let unit_tests =
 	     (Command.from_string ":foo NICK name");
 	   assert_equal
 	     ~printer:Command.as_string
-	     (Command.create 
-		(Some "foo.bar") 
-		"PART" ["#foo"; "#bar"]
+	     (Command.create (Some "foo.bar") "PART" ["#foo"; "#bar"]
 		(Some "ta ta"))
 	     (Command.from_string ":foo.bar PART #foo #bar :ta ta");
 	)