diff --git a/code/ArchiveWidget.php b/code/ArchiveWidget.php
index 886e4af..0746d11 100644
--- a/code/ArchiveWidget.php
+++ b/code/ArchiveWidget.php
@@ -99,9 +99,9 @@ class ArchiveWidget extends Widget {
 			));
 			
 			if($isMonthDisplay) {
-				$link = $container->Link() . $sqlResult['Year']. '/' . sprintf("%'02d", $monthVal);
+				$link = $container->Link($sqlResult['Year']) . '/' . sprintf("%'02d", $monthVal);
 			} else {
-				$link = $container->Link() . $sqlResult['Year'];
+				$link = $container->Link($sqlResult['Year']);
 			}
 			
 			$results->push(new ArrayData(array(
@@ -113,4 +113,4 @@ class ArchiveWidget extends Widget {
 		return $results;
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/code/TagCloudWidget.php b/code/TagCloudWidget.php
index 9cfee70..1bc7757 100644
--- a/code/TagCloudWidget.php
+++ b/code/TagCloudWidget.php
@@ -92,7 +92,7 @@ class TagCloudWidget extends Widget {
 						"Tag" => $tag,
 						"Count" => $count,
 						"Class" => $class,
-						"Link" => $container->Link() . 'tag/' . urlencode($tag)		
+						"Link" => $container->Link('tag') . '/' . urlencode($tag)		
 					);
 				}
 			}