diff --git a/common/functions.php b/common/functions.php
index 388e8d78e..154d60455 100644
--- a/common/functions.php
+++ b/common/functions.php
@@ -32,7 +32,7 @@ function config($key, $value = null)
  * @param string $value `$code`s value
  * @return mixed
  */
-function lang($code = null, $value = null)
+function lang($code, $value = null)
 {
 	if (!$GLOBALS['lang'] instanceof Rhymix\Framework\Lang)
 	{
@@ -40,17 +40,13 @@ function lang($code = null, $value = null)
 		$GLOBALS['lang']->loadDirectory(RX_BASEDIR . 'common/lang', 'common');
 	}
 	
-	if ($code !== null && $value === null)
+	if ($value === null)
 	{
 		return $GLOBALS['lang']->get($code);
 	}
-	else if ($code !== null && $value !== null)
-	{
-		$GLOBALS['lang']->set($code, $value);
-	}
 	else
 	{
-		return $GLOBALS['lang']->langType();
+		$GLOBALS['lang']->set($code, $value);
 	}
 }