diff --git a/Environment/FlatAtmosphere/FlatAtmosphere.h b/Environment/FlatAtmosphere/FlatAtmosphere.h
index 90582b3dfb00d2d85850b81455a2a4c0c061413b..1495baac4cd04881d6d2792d5ab9ee8c35b5ba38 100644
--- a/Environment/FlatAtmosphere/FlatAtmosphere.h
+++ b/Environment/FlatAtmosphere/FlatAtmosphere.h
@@ -1,10 +1,11 @@
 
 /**
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
+  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+  * 
+  * See file AUTHORS for a list of contributors.
+  * 
+  * This software is distributed under the terms of the GNU General Public
+  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+  * the license.
+*/
+
diff --git a/Main/Environment.h b/Main/Environment.h
index 90582b3dfb00d2d85850b81455a2a4c0c061413b..1495baac4cd04881d6d2792d5ab9ee8c35b5ba38 100644
--- a/Main/Environment.h
+++ b/Main/Environment.h
@@ -1,10 +1,11 @@
 
 /**
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
+  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+  * 
+  * See file AUTHORS for a list of contributors.
+  * 
+  * This software is distributed under the terms of the GNU General Public
+  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+  * the license.
+*/
+
diff --git a/Main/Stack.h b/Main/Stack.h
index 90582b3dfb00d2d85850b81455a2a4c0c061413b..1495baac4cd04881d6d2792d5ab9ee8c35b5ba38 100644
--- a/Main/Stack.h
+++ b/Main/Stack.h
@@ -1,10 +1,11 @@
 
 /**
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
+  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+  * 
+  * See file AUTHORS for a list of contributors.
+  * 
+  * This software is distributed under the terms of the GNU General Public
+  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+  * the license.
+*/
+
diff --git a/do-copyright.py b/do-copyright.py
index 2953476d9cca4f4b34e9ba3e8e3e46a481639923..c771a570f5908067ea89c4ef2e8c934ac9c79b61 100755
--- a/do-copyright.py
+++ b/do-copyright.py
@@ -43,13 +43,18 @@ def checkNote(filename):
         iLine += 1
 
     # now check if copyright notice is already there and identical...
-    isSame = True
+    isSame = False
     if startNote>=0 and endNote>=0 and isCopyright:
+        isSame = True
         noteLines = text.split('\n')        
-        for iLine in range(len(noteLines)):
-            if noteLines[iLine] != lines[startNote+iLine]:
+        for iLine in range(len(noteLines)-2):
+            if startNote+iLine >= len(lines):
                 isSame = False
-                print "not same: " + noteLines[iLine] + " " + lines[startNote+iLine]
+                break            
+            if noteLines[iLine+1].strip(" \n") != lines[startNote+iLine].strip(" \n"):
+                isSame = False
+                print "not same: " + filename + " new=\'" + noteLines[iLine+1] + "\' vs old=\'" + lines[startNote+iLine].rstrip('\n') + "\'"
+                break
 
     # check if notice is the same 
     if isSame: