diff --git a/data/auth.sqlite b/data/auth.sqlite
index b82db65..14be0cc 100644
Binary files a/data/auth.sqlite and b/data/auth.sqlite differ
diff --git a/data/users/warren.sqlite b/data/users/warren.sqlite
index a865684..85b386c 100644
Binary files a/data/users/warren.sqlite and b/data/users/warren.sqlite differ
diff --git a/src/scan.rs b/src/scan.rs
index 32fbd18..48f18be 100644
--- a/src/scan.rs
+++ b/src/scan.rs
@@ -146,8 +146,6 @@ pub fn scan_directory(user_id: &str, dir: &str, batch_size: usize, options: Scan
         
         let node_id = generate_uuid(path_str, filename, &mac, mtime_secs);
         
-        file_info.push((node_id.clone(), path_str.clone()));
-        
         let file_dir = Path::new(path_str).parent().unwrap_or(dir_path);
         let parent_node_id = if file_dir == dir_path {
             Some(root_node_id.clone())
@@ -155,15 +153,19 @@ pub fn scan_directory(user_id: &str, dir: &str, batch_size: usize, options: Scan
             folder_id_map.get(file_dir.to_string_lossy().as_ref()).cloned()
         };
         
+        let node_id_clone = node_id.clone();
+        
+        file_info.push((node_id_clone.clone(), path_str.clone()));
+        
         file_nodes.push(FileNode {
-            node_id,
+            node_id: node_id_clone.clone(),
             label: filename.clone(),
             aliases: {
                 let mut aliases = Aliases::empty();
                 aliases.set("path", path_str);
                 aliases
             },
-            file_uuid: None,
+            file_uuid: Some(node_id_clone.clone()),
             sha256: None,
             parent_id: parent_node_id,
             children: Vec::new(),