diff --git a/e107_core/templates/page_template.php b/e107_core/templates/page_template.php
index 8c47c78a5..535abe2e3 100644
--- a/e107_core/templates/page_template.php
+++ b/e107_core/templates/page_template.php
@@ -161,7 +161,7 @@ $sc_style['CPAGENAV|default']['post'] = '</div>';
 	$PAGE_TEMPLATE['nav']['end'] 					= '</ul>';	
 	
 	
-	$PAGE_TEMPLATE['nav']['submenu_start'] 			= '<ul class="page-nav" id="{LINK_PARENT}" role="menu" >';
+	$PAGE_TEMPLATE['nav']['submenu_start'] 			= '<ul class="page-nav" id="page-nav-{LINK_PARENT}" role="menu" >';
 	
 	
 	$PAGE_TEMPLATE['nav']['submenu_item'] 			= '
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index 3cf188dee..c727235c9 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -1465,7 +1465,8 @@ class navigation_shortcodes extends e_shortcode
 			return;	
 		}	
 		
-		$text = $this->template['submenu_start'];
+		// XXX possible dead loop if LINK_SUB SC present in submenu_start template
+		$text = e107::getParser()->parseTemplate($this->template['submenu_start'], true, $this);
 			
 		foreach($this->var['link_sub'] as $val)
 		{
@@ -1475,7 +1476,8 @@ class navigation_shortcodes extends e_shortcode
 			$text .= e107::getParser()->parseTemplate($tmpl, TRUE);		
 		}
 
-		$text .= $this->template['submenu_end'];
+		// XXX possible dead loop if LINK_SUB SC present in submenu_end template
+		$text .= e107::getParser()->parseTemplate($this->template['submenu_end'], true, $this);
 		
 		return $text;
 	}