diff --git a/_config.yml b/_config.yml
index 4c21144..9d0995d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -47,7 +47,7 @@ verbose: false
 # 7. Site settings
 analytics_adobe: ""
 assets: "https://wet-boew.github.io/themes-dist"
-baseurl: ""
+baseurl: "" # If the site is in a subdirectory like on github.io then set this to "/dirname"
 description:
   en: "Jekyll variant for GCWeb theme" # English site description and default description
   fr: "Adaption Jekyll du theme GCWeb" # French site description and default description
diff --git a/_includes/language/languagetoggle.html b/_includes/language/languagetoggle.html
index 84ad444..0aca4d7 100644
--- a/_includes/language/languagetoggle.html
+++ b/_includes/language/languagetoggle.html
@@ -2,7 +2,7 @@
 	<h2 class="wb-inv">{{ i18nText-language }}</h2>
 	<ul class="list-inline mrgn-bttm-0">
 		<li>
-			<a lang="{{ i18nText-altLang }}" hreflang="{{ i18nText-altLang }}" href="{{ page.altLangPage }}">
+			<a lang="{{ i18nText-altLang }}" hreflang="{{ i18nText-altLang }}" href="{{ page.altLangPage | relative_url }}">
 				<span class="hidden-xs" translate="no">{{ i18nText-altLanguage }}</span>
 				<abbr title="{{ i18nText-altLanguage }}" translate="no" class="visible-xs h3 mrgn-tp-sm mrgn-bttm-0 text-uppercase">{{ i18nText-altLang }}</abbr>
 			</a>