diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc90683..35d2d3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.1.5
+## 06/10/2016
+
+1. [](#bugfix)
+    * Fixed language display in langswitcher template
+
 # v1.1.4
 ## 06/10/2016
 
diff --git a/blueprints.yaml b/blueprints.yaml
index f2761ac..cafacd4 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Nucleare
-version: 1.1.4
+version: 1.1.5
 description: "Theme for the Grav CMS, based on the WordPress theme named Nucleare. It's mainly aimed to be used for a Blog, but you can also create simple pages. Modular pages to come"
 icon: empire
 author:
diff --git a/templates/partials/langswitcher.html.twig b/templates/partials/langswitcher.html.twig
index 1ee9dfc..a69ef5f 100644
--- a/templates/partials/langswitcher.html.twig
+++ b/templates/partials/langswitcher.html.twig
@@ -5,7 +5,7 @@
 			<li>
 				<a>{{  langswitcher.current }}</a>
 				<ul class="sub-menu">
-					{% for key, language in langswitcher.languages %}
+					{% for key in langswitcher.languages %}
 
 					    {% if key == langswitcher.current %}
 					        {% set lang_url = page.url %}
@@ -15,7 +15,7 @@
 					        {% set active_class = '' %}
 					    {% endif %}
 
-					    <li class="{{ active_class }}"><a href="{{ lang_url }}">{{  language.nativeName|capitalize }}</a></li>
+					    <li class="{{ active_class }}"><a href="{{ lang_url ~ uri.params }}">{{  native_name(key)|capitalize }}</a></li>
 
 					{% endfor %}
 				</ul>