diff --git a/src/FAST-Core-Tools/FASTCFGTVisitor.trait.st b/src/FAST-Core-Tools/FASTCFGTVisitor.trait.st
index 5e393d0..28f8011 100644
--- a/src/FAST-Core-Tools/FASTCFGTVisitor.trait.st
+++ b/src/FAST-Core-Tools/FASTCFGTVisitor.trait.st
@@ -8,16 +8,53 @@ In case of loops, I'll visit the next blocks only once.
 Trait {
 	#name : 'FASTCFGTVisitor',
 	#instVars : [
-		'visitedBlocks'
+		'visitedBlocks',
+		'stoppingBlocks'
 	],
 	#category : 'FAST-Core-Tools-CFG',
 	#package : 'FAST-Core-Tools',
 	#tag : 'CFG'
 }
 
+{ #category : 'hooks' }
+FASTCFGTVisitor >> postConditonalsBranchVisitOf: firstBranchBlock conditional: aConditionalBlock [
+	"No-op - hook"
+
+	
+]
+
+{ #category : 'hooks' }
+FASTCFGTVisitor >> postConditonalsBranchesVisitOf: aConditionalBlock [
+	"No-op - hook"
+
+	
+]
+
+{ #category : 'hooks' }
+FASTCFGTVisitor >> preConditonalsBranchVisitOf: firstBranchBlock conditional: aConditionalBlock [
+	"No-op - hook"
+
+	
+]
+
+{ #category : 'hooks' }
+FASTCFGTVisitor >> preConditonalsBranchesVisitOf: aConditionalBlock [
+	"No-op - hook"
+
+	
+]
+
+{ #category : 'accessing' }
+FASTCFGTVisitor >> stoppingBlocks [
+
+	^ stoppingBlocks ifNil: [ stoppingBlocks := OrderedCollection new ]
+]
+
 { #category : 'visiting' }
 FASTCFGTVisitor >> visit: aCFGBlockOrFASTEntity [
 
+	(self visitedBlocks includes: aCFGBlockOrFASTEntity) ifTrue: [ ^ self ]. "Breaking the visit if it was already visited"
+	(self stoppingBlocks includes: aCFGBlockOrFASTEntity) ifTrue: [ ^ self ]. "When visiting conditionals, we want to visit all the blocks of the conditional before visiting the following blocks. I am here to skip the visit of the following blocks while the conditional is not done. Then the conditional will start again the visit from its merge block."
 	^ aCFGBlockOrFASTEntity ifNotNil: [ aCFGBlockOrFASTEntity accept: self ]
 ]
 
@@ -26,15 +63,26 @@ FASTCFGTVisitor >> visitCFGAbstractBlock: aBlock [
 	"Any block visit their statements and next block if this was not done already (this can happen with loop blocks)."
 
 	self visitedBlocks add: aBlock.
-
-	aBlock statements do: [ :statement | statement accept: self ].
-	aBlock nextBlocks do: [ :block | (self visitedBlocks includes: block) ifFalse: [ block accept: self ] ]
+	aBlock statements do: [ :statement | statement accept: self ]
 ]
 
 { #category : 'visiting' }
 FASTCFGTVisitor >> visitCFGAbstractConditionalBlock: aBlock [
 
-	self visitCFGAbstractBlock: aBlock
+	| mergeBlock |
+	self visitCFGAbstractBlock: aBlock.
+
+	self preConditonalsBranchesVisitOf: aBlock.
+	self stoppingBlocks add: (mergeBlock := aBlock mergeBlock).
+
+	aBlock nextBlocks do: [ :block |
+			self preConditonalsBranchVisitOf: block conditional: aBlock.
+			self visit: block.
+			self postConditonalsBranchVisitOf: block conditional: aBlock ].
+
+	self stoppingBlocks remove: mergeBlock.
+	self postConditonalsBranchesVisitOf: aBlock.
+	self visit: mergeBlock
 ]
 
 { #category : 'visiting' }
@@ -43,7 +91,9 @@ FASTCFGTVisitor >> visitCFGAbstractMultipleConditionalBlock: aBlock [
 	aBlock patterns do: [ :pattern |
 			pattern isCollection
 				ifTrue: [ pattern do: [ :statement | statement accept: self ] ]
-				ifFalse: [ pattern accept: self ] ].
+				ifFalse: [ 
+				"We do a nil check because if we have a default case, the pattern will be nil"
+				pattern ifNotNil: [ self visit: pattern ] ] ].
 
 	self visitCFGAbstractConditionalBlock: aBlock
 ]
@@ -51,7 +101,9 @@ FASTCFGTVisitor >> visitCFGAbstractMultipleConditionalBlock: aBlock [
 { #category : 'visiting' }
 FASTCFGTVisitor >> visitCFGBlock: aBlock [
 
-	self visitCFGAbstractBlock: aBlock
+	self visitCFGAbstractBlock: aBlock.
+
+	self visit: aBlock nextBlock
 ]
 
 { #category : 'visiting' }