diff --git a/test.c b/test.c
index 94587e1..4033c6b 100644
--- a/test.c
+++ b/test.c
@@ -53,14 +53,14 @@ int
 main()
 {
 	char buf[0x200];
-	int i;
+	int i, l;
 
 	for (i = 0; teststr[i]; i++)
 	{
 		hexdump(teststr[i], 0);
 
-		if (xconv(teststr[i], buf, sizeof(buf)))
-			hexdump(buf, 0);
+		if ((l = xconv(teststr[i], buf, sizeof(buf))))
+			hexdump(buf, l);
 		else
 			printf("Unchanged.\n");
 
diff --git a/xconv.c b/xconv.c
index ccb4caa..b454f15 100644
--- a/xconv.c
+++ b/xconv.c
@@ -107,6 +107,6 @@ xconv(char *src, char *dst, size_t dstlen)
 		return 0;
 	
 	*d = '\0';
-	return dstlen - len;
+	return dstlen - len - 1;
 }