--- a/SourceCodeManagerUtilities.st	Thu Jan 25 19:13:26 2018 +0100
+++ b/SourceCodeManagerUtilities.st	Thu Jan 25 22:42:56 2018 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2000 eXept Software AG
               All Rights Reserved
@@ -709,10 +711,9 @@
      info line, even if the selector was removed afterwards).
      So check the outcome."
 
+    |printSelectors initialLogStream additionalInfoPerChangedSelector changesForThisCheckin changesPerClass|
 
     "/ a helper function
-    |printSelectors initialLogStream additionalInfoPerChangedSelector changesForThisCheckin changesPerClass|
-
     printSelectors := 
         [:what :selectors :more |
             |sel moreInfo|
@@ -854,7 +855,8 @@
                                 unchangedVariables := variableMapping keys select:[:k | (variableMapping at:k) = k].
                                 variableMapping removeAllKeys:unchangedVariables.
 
-                                (variableMapping at:'self' ifAbsent:'self') = 'self' ifTrue:[
+                                (((variableMapping at:'self' ifAbsent:'self') = 'self')
+                                and:[ (variableMapping keyAtEqualValue:'self' ifAbsent:'self') = 'self']) ifTrue:[
                                     ((variableMapping associations count:[:assoc | assoc key ~= assoc value]) == 0) ifTrue:[
                                         selectorsWithCommentOrFormattingChangeOnly add:eachSelector.
                                     ] ifFalse:[