diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index 689f238..4c50d76 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -1249,14 +1249,14 @@ function IncludeLanguageFile( $langfile, $failOnError = true )
 	global $LANG, $LANG_EN; 
 
 	// If english is not selected, we load ENGLISH first - then overwrite with configured language
-	if ( $LANG != "en" ) 
-		$langengfile = str_replace( $LANG, $LANG_EN, $langfile );
+	if ( $LANG != "en" ) {
+		//Fix #56
+		$langengfile = str_replace( "/".$LANG."/", "/".$LANG_EN."/", $langfile );
+		$langengfile = str_replace( ".".$LANG.".", ".".$LANG_EN.".", $langengfile );
+	}
 	else
 		$langengfile = $langfile;
 	
-	//Fix #56
-	$langengfile = str_replace( "/classen/", "/classes/", $langengfile );
-	
 	if ( file_exists($langengfile) )
 		include( $langengfile );
 	else