diff --git a/lib/helpers.js b/lib/helpers.js
index d70210f6a..4440a1da6 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -62,12 +62,13 @@ module.exports = {
     });
   },
   loc: function(data, language) {
-    var wfl;
+    var page, wfl;
     if (data == null) {
       data = {};
     }
     wfl = _.last(arguments);
-    language = language || wfl.options.defaultLanguage;
+    page = arguments[arguments.length - 2];
+    language = wfl.options.languages.indexOf(language) > -1 ? language : page.language || wfl.options.defaultLanguage;
     if (_.isArray(data)) {
       return data.map((function(_this) {
         return function(item) {
diff --git a/package.json b/package.json
index 5e9e86104..a3f0e7ade 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "waffel",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Static site generation done tasty.",
   "main": "lib/index.js",
   "homepage": "http://moonwave99.github.io/waffel/",