--- includes/menu.inc	Thu Dec 09 12:57:18 2010
+++ includes/menu.inc	Thu Dec 16 16:14:22 2010
@@ -1561,8 +1561,8 @@
     list($key, $curr) = each($tree);
 
     while ($curr) {
-      // Terminate the loop when we find the current path in the active trail.
-      if ($curr['link']['href'] == $item['href']) {
+      // Terminate the loop when we find the current path in the active trail and there's no link below.
+      if ($curr['link']['href'] == $item['href'] && !$curr['below']) {
         $trail[] = $curr['link'];
         $curr = FALSE;
       }