diff --git a/src/FamixFortranCamfortImporter/FortranAbstractJsonVisitor.class.st b/src/FamixFortranCamfortImporter/FortranAbstractJsonVisitor.class.st
index bcc683e..d2eb44e 100644
--- a/src/FamixFortranCamfortImporter/FortranAbstractJsonVisitor.class.st
+++ b/src/FamixFortranCamfortImporter/FortranAbstractJsonVisitor.class.st
@@ -154,8 +154,7 @@ FortranAbstractJsonVisitor >> visitBlock_data: aBlockDataNode [
 
 { #category : #'visiting statement' }
 FortranAbstractJsonVisitor >> visitBlocks: aBlockList [
-	aBlockList ifNil: [ ^#() ].
-	^self visitJsonArray: aBlockList
+	^self visitBody: aBlockList
 ]
 
 { #category : #'visiting statement' }
@@ -1015,7 +1014,7 @@ FortranAbstractJsonVisitor >> visitTarget: aTargetNode [
 
 { #category : #'visiting statement' }
 FortranAbstractJsonVisitor >> visitThenPart: aThenPartNode [
-	^self visitJsonElement: aThenPartNode
+	^self visitBody: aThenPartNode
 ]
 
 { #category : #'visiting statement' }