diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
index 2973547ee..378d9cb4e 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
@@ -80,7 +80,12 @@ public class StrutsTilesRequestContext extends TilesRequestContextWrapper {
     }
 
     public void dispatch(String include) throws IOException {
-        include(include);
+    	if (include.endsWith(mask)) {
+            // FIXME This way FreeMarker results still don't have a content-type!
+    	    include(include);
+        } else {
+            super.dispatch(include);
+        }
     }
 
     /**