diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXWOComponentContent.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXWOComponentContent.java
index 1ae1879b6a1..5e5357ff5da 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXWOComponentContent.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXWOComponentContent.java
@@ -154,7 +154,7 @@ private WOElement template(WOComponent component) {
     	WOElement content =  component._childTemplate();
     	WOElement result = null;
     	String templateName = (_templateName == null) ? null : (String) _templateName.valueInComponent(component);
-    	if (content instanceof WODynamicGroup) {
+    	if (content.getClass() == WODynamicGroup.class) {
 			WODynamicGroup group = (WODynamicGroup) content;
 			if (templateName == null) {
 				// MS: If you don't set a template name, then let's construct all the children of 
@@ -190,7 +190,7 @@ private WOElement template(WOComponent component) {
     		if(name.equals(templateName)) {
     			result = template;
     		}
-		} else if (content instanceof WOHTMLBareString && templateName == null) {
+		} else if (templateName == null) {
 			result=content;
 		}
     	return result;