diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8cb64c3..4b41811 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -10,8 +10,8 @@ location __PATH__/ {
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
   #client_max_body_size 50M;
 
-set $args $args&lang=__LANGUAGE__;
-
+rewrite ^(.*)$ $1?lang=__LANGUAGE__ break;
+  
 try_files $uri $uri/ index.php;
 location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
@@ -22,7 +22,6 @@ location ~ [^/]\.php(/|$) {
     fastcgi_param REMOTE_USER $remote_user;
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param SCRIPT_FILENAME $request_filename;
-    set $args $args&lang=__LANGUAGE__;
   }
 ### End of PHP configuration part