diff --git a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
index 0ad0545f2..f90dad1b2 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/AbstractAdapterNode.java
@@ -131,8 +131,10 @@ public abstract class AbstractAdapterNode implements AdapterNode {
     public Node getChildBeforeOrAfter(Node child, boolean before) {
         log.debug("getChildBeforeOrAfter: ");
         List adapters = getChildAdapters();
-        log.debug("childAdapters = " + adapters);
-        log.debug("child = " + child);
+        if (log.isDebugEnabled()) {
+            log.debug("childAdapters = " + adapters);
+            log.debug("child = " + child);
+        }
         int index = adapters.indexOf(child);
         if (index < 0)
             throw new StrutsException(child + " is no child of " + this);
@@ -251,7 +253,7 @@ public abstract class AbstractAdapterNode implements AdapterNode {
                     + ((next == null) ? "null" : next.getNodeName()));
         }
 
-        return getParent().getChildAfter(this);
+        return next;
     }
 
     public Node getPreviousSibling() {