diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index a0f60a6ed104548d98b96d061d6587cdfc7b3032..72dadf4df24cd954781cb5366a10fda15e3a8de9 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -133,8 +133,12 @@ function chameleon_node($node, $main = 0, $page = 0) {
     $terms = taxonomy_link("taxonomy terms", $node);
   }
 
+  $links = array_merge($submitted, $terms);
   if ($node->links) {
-    $output .= " <div class=\"links\">". theme('links', array_merge($submitted, $terms, $node->links)) ."</div>\n";
+    $links = array_merge($links, $node->links);
+  }
+  if (count($links)) {
+    $output .= " <div class=\"links\">". theme('links', $links) ."</div>\n";   
   }
 
   $output .= "</div>\n";