diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 801ad1ac..cc4502e2 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -42,7 +42,8 @@
       <j:set 
         var="reports" 
         value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
-      
+
+      <!-- check if the given name is in the list already -->      
       <j:set var="add" value="true"/>
       <j:forEach var="rpt" items="${reports}">
         <j:if test="${rpt.get('name').equals(name)}">
@@ -288,8 +289,7 @@
 
         <!-- generate output file name -->
         <util:replace var="outFileForward" oldChar="\" newChar="/" value="${file.toString()}"/>
-        <j:set var="outFiles" value="${mapper.mapFileName(outFileForward)}"/>
-        <j:set var="outFile" value="${outFiles[0]}"/>
+        <j:set var="outFile" value="${mapper.mapFileName(outFileForward).0}"/>
 
         <echo>Generating ${outFile} from ${file}</echo>
         <!-- work out relative path -->