diff --git a/build_tools/gather_sources.py b/build_tools/gather_sources.py
index ca8c3d1..509f1a4 100644
--- a/build_tools/gather_sources.py
+++ b/build_tools/gather_sources.py
@@ -131,13 +131,14 @@ The fact that you are presently reading this means that you have had
 knowledge of the CeCILL license and that you accept its terms.
 +*/
 """
-  relimit = r'^(?s)/\*\+.*\+\*/'
+  relimit = r'^(?s)/\*\+.*\+\*/\n'
   print("C++ file: %s" % filename)
   apply_license(license, relimit, filename)
   
 
 def analyze_tree(prefix, t):
-  for ename,entry in t.items():
+  for entry in t.items():
+    ename = entry.name
     if ename == 'external' or ename == 'zobov':
       continue
     if type(entry) == Tree: