--- sites/all/modules/superfish/superfish_1.module	Wed Oct 26 00:04:41 2011
+++ sites/all/modules/superfish/superfish_nolink.module	Wed Oct 26 00:21:39 2011
@@ -1002,14 +1002,15 @@
       }
       $menu_item['link']['localized_options']['attributes']['class'] = $link_class;
  
-      $link_options['attributes'] = $menu_item['link']['localized_options']['attributes'];
-      
+      $link_options['attributes'] = array('class' => array_filter($link_class));
+      $link_options+= $menu_item['link']['localized_options'];    
+
       // Render the menu item.
       $output['content'] .= '<li id="menu-' . $mlid . '-' . $id . '"';
       $output['content'] .= ($item_class) ? ' class="' . trim($item_class) . '">' : '>';
       $output['content'] .= ($megamenu_column) ? '<div class="sf-megamenu-column">' : '';
       $output['content'] .= isset($whl[0]) ? $whl[0] : '';
-      $output['content'] .= l($menu_item['link']['title'], $menu_item['link']['link_path'], $link_options);
+      $output['content'] .= l($menu_item['link']['title'], $menu_item['link']['href'], $link_options);
       $output['content'] .= isset($whl[1]) ? $whl[1] : '';
       $output['content'] .= ($megamenu_wrapper) ? '<ul class="sf-megamenu"><li class="sf-megamenu-wrapper ' . $item_class . '">' : '';
       $output['content'] .= ($show_children) ? (isset($wul[0]) ? $wul[0] : '') : '';