diff --git a/mainscripts/Converter.py b/mainscripts/Converter.py
index 2e939c2..509a168 100644
--- a/mainscripts/Converter.py
+++ b/mainscripts/Converter.py
@@ -687,7 +687,13 @@ def main (args, device_args):
                     io.log_err ("%s is not a dfl image file" % (filepath.name) )
                     continue
 
-                source_filename_stem = Path( dflimg.get_source_filename() ).stem
+                source_filename = dflimg.get_source_filename()
+                if source_filename is None or source_filename == "_":
+                    continue
+                
+                source_filename = Path(source_filename)
+                source_filename_stem = source_filename.stem
+                
                 if source_filename_stem not in alignments.keys():
                     alignments[ source_filename_stem ] = []
 
diff --git a/mainscripts/FacesetRelighter.py b/mainscripts/FacesetRelighter.py
index 227e2b4..5d90cd2 100644
--- a/mainscripts/FacesetRelighter.py
+++ b/mainscripts/FacesetRelighter.py
@@ -235,7 +235,9 @@ def relight(input_dir, lighten=None, random_one=None):
                         i += 1
 
                     cv2_imwrite (relighted_filepath, relighted_img )
-                    dflimg.embed_and_set (relighted_filepath, source_filename="_", relighted=True )
+                    
+                    dflimg.remove_source_filename()
+                    dflimg.embed_and_set (relighted_filepath, relighted=True )
         except:
             io.log_err (f"Exception occured while processing file {filepath.name}. Error: {traceback.format_exc()}")
 
diff --git a/utils/DFLJPG.py b/utils/DFLJPG.py
index 9cb2c11..057c8c8 100644
--- a/utils/DFLJPG.py
+++ b/utils/DFLJPG.py
@@ -246,6 +246,9 @@ class DFLJPG(object):
 
     def remove_fanseg_mask(self):
         self.dfl_dict['fanseg_mask'] = None
+        
+    def remove_source_filename(self):
+        self.dfl_dict['source_filename'] = None
 
     def dump(self):
         data = b""
diff --git a/utils/DFLPNG.py b/utils/DFLPNG.py
index 7e84616..c25cdd0 100644
--- a/utils/DFLPNG.py
+++ b/utils/DFLPNG.py
@@ -364,6 +364,9 @@ class DFLPNG(object):
 
     def remove_fanseg_mask(self):
         self.dfl_dict['fanseg_mask'] = None
+        
+    def remove_source_filename(self):
+        self.dfl_dict['source_filename'] = None
 
     def dump(self):
         data = PNG_HEADER