diff --git a/src/NewTools-RewriterTools-Backend/StRewriterRenrakuApplier.class.st b/src/NewTools-RewriterTools-Backend/StRewriterRenrakuApplier.class.st
index eb254dedb..5afa5bce9 100644
--- a/src/NewTools-RewriterTools-Backend/StRewriterRenrakuApplier.class.st
+++ b/src/NewTools-RewriterTools-Backend/StRewriterRenrakuApplier.class.st
@@ -68,6 +68,7 @@ Take a look on ReCriticEngine for some automation ideas. Also take a look at Com
 StRewriterRenrakuApplier class >> obtainCritiquesOfAllMethodsForRules: ruleHolderCollection [
 
 	| methods |
-	methods := (self packageOrganizer packages flatCollect: #classes) flatCollect: #methods.
+	methods := (self packageOrganizer packages flatCollect: #classes)
+		           flatCollect: [ :each | each methods , each class methods ].
 	^ self obtainCritiquesOf: methods forRules: ruleHolderCollection
 ]
diff --git a/src/NewTools-RewriterTools/StRewriterExpressionFinderPresenter.class.st b/src/NewTools-RewriterTools/StRewriterExpressionFinderPresenter.class.st
index 4e062bbc9..41ea7bd7d 100644
--- a/src/NewTools-RewriterTools/StRewriterExpressionFinderPresenter.class.st
+++ b/src/NewTools-RewriterTools/StRewriterExpressionFinderPresenter.class.st
@@ -125,7 +125,7 @@ StRewriterExpressionFinderPresenter >> searchExpressionOnAllClasses [
 	| dialogWindow methods ruleHolder critiques |
 	dialogWindow := scopeSelectorPresenter openDialog.
 	dialogWindow okAction: [
-		methods := scopeSelectorPresenter selectedClasses flatCollectAsSet: [ :each | each methods ].
+		methods := scopeSelectorPresenter selectedClasses flatCollectAsSet: [ :each | each methods, each class methods ].
 		ruleHolder := StRewriterRuleHolder lhs: patternCodePresenter lhs rhs: ''.
 		critiques := StRewriterRenrakuApplier obtainCritiquesOf: methods forRules: { ruleHolder }.
 		(StRewriterOccurrencesBrowserPresenter critiques: critiques) open ]