diff --git a/haggis.c b/haggis.c
index d604323..23f1b11 100644
--- a/haggis.c
+++ b/haggis.c
@@ -535,7 +535,7 @@ int haggis_init_hardlink_node(
 
     node->filetype.tag = hardlink;
     haggis_filename_init(target, &node->filetype.f_type.target);
-    body.f_name = node->name.name;
+    body.f_name = strndup(node->name.name, PATH_MAX);
     msg = haggis_msg_init(NodeCreated, body);
     if (msg == NULL)
         return 1;
@@ -568,7 +568,7 @@ int haggis_init_file_node(
         haggis_node_deinit(node);
         return 1;
     }
-    body.f_name = node->name.name;
+    body.f_name = strndup(node->name.name, PATH_MAX);
     msg = haggis_msg_init(NodeCreated, body);
     haggis_mq_push(mq, msg);
     return 0;
diff --git a/test/Makefile b/test/Makefile
index 582c379..31f9a6f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -74,6 +74,7 @@ tests      += mq_push_pop
 tests      += extract_dev_node
 tests      += extract_dir_node
 tests      += extract_fifo_node
+tests      += extract_file_node
 
 total      != echo $(tests) | wc -w | awk '{ print $$1 }'
 
diff --git a/test/extract_file_node.c b/test/extract_file_node.c
new file mode 100644
index 0000000..df41c5d
--- /dev/null
+++ b/test/extract_file_node.c
@@ -0,0 +1,38 @@
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "haggis.h"
+#include "mq.h"
+
+int main() {
+    haggis_node    *node = NULL;
+    haggis_linkmap *map  = NULL;
+    haggis_mq       mq;
+    haggis_msg     *msg  = NULL;
+    char           *inf   = "Makefile";
+    int             ret  = 0;
+
+    map = haggis_linkmap_init();
+    assert(map != NULL);
+    assert(haggis_mq_init(&mq) == 0);
+    node = haggis_create_node(inf, sha256, map, &mq);
+    assert(node != NULL);
+    assert(node->filetype.tag == normal);
+    assert(memcmp(node->name.name, inf, 8) == 0);
+    ret = haggis_extract_node("output/extracted", node, &mq);
+    assert(ret == 0);
+    msg = haggis_mq_pop(&mq);
+    assert(msg->tag == NodeCreated);
+    assert(memcmp(msg->body.f_name, inf, 8) == 0);
+    haggis_msg_deinit(msg);
+    msg = haggis_mq_pop(&mq);
+    assert(msg->tag == NodeExtracted);
+    assert(memcmp(msg->body.f_name, inf, 8) == 0);
+    assert(mq.head == NULL);
+    assert(mq.tail == NULL);
+    haggis_msg_deinit(msg);
+    haggis_node_deinit(node);
+    haggis_linkmap_deinit(map);
+    return 0;
+}