diff --git a/src/Bloc/BlLayoutErrorHandler.class.st b/src/Bloc/BlLayoutErrorHandler.class.st
index 237b9e719..47fe4aaa7 100644
--- a/src/Bloc/BlLayoutErrorHandler.class.st
+++ b/src/Bloc/BlLayoutErrorHandler.class.st
@@ -11,18 +11,16 @@ BlLayoutErrorHandler >> matches: aFramePhase [
 
 { #category : #'error handling' }
 BlLayoutErrorHandler >> processError: aBlHandledError [
+
 	NonInteractiveTranscript stderr
 		show: aBlHandledError;
 		cr.
 	self flag: 'crappy'. 
 	"Temporary reset the layout of the parent if it's an infinite element.
 	Should be replaced with a more generic solution."
-	aBlHandledError element
-		withAllParentsDo: [ :aParentElement | 
-			"(aParentElement isKindOf: #BlInfiniteElement asClass)
-				ifTrue: [ aParentElement state beStepStart ]."
-			(aParentElement isKindOf: BlInfiniteElement)
-				ifTrue: [ aParentElement state beStepStart ] ].
+	aBlHandledError element withAllParentsDo: [ :aParentElement | 
+		(aParentElement class name equals: #BlInfiniteElement)
+			ifTrue: [ aParentElement state beStepStart ] ].
 
 	aBlHandledError debug
 ]