diff --git a/org.adempiere.base/src/org/compiere/model/MCountry.java b/org.adempiere.base/src/org/compiere/model/MCountry.java
index 3fad08c014..c2516d1b02 100644
--- a/org.adempiere.base/src/org/compiere/model/MCountry.java
+++ b/org.adempiere.base/src/org/compiere/model/MCountry.java
@@ -47,7 +47,7 @@ public class MCountry extends X_C_Country
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -4015127112992493778L;
+	private static final long serialVersionUID = -4966707939803861163L;
 
 	/**
 	 * 	Get Country (cached)
@@ -163,17 +163,6 @@ public class MCountry extends X_C_Country
 			+ " - Default=" + s_default);
 	}
 
-	/**
-	 *	Return Language
-	 *  @return Name
-	 */
-	private String getEnvLanguage() {
-		String lang = Env.getAD_Language(Env.getCtx());
-		if (Language.isBaseLanguage(lang))
-			return null;
-		return lang;
-	}
-
 	/**
 	 * 	Set the Language for Display (toString)
 	 *	@param AD_Language language or null
@@ -232,22 +221,13 @@ public class MCountry extends X_C_Country
 		super(ctx, rs, trxName);
 	}	//	MCountry
 
-	/**	Translated Name			*/
-	private String	m_trlName = null;
-	
 	/**
 	 *	Return Name - translated if DisplayLanguage is set.
 	 *  @return Name
 	 */
 	public String toString()
 	{
-		if (getEnvLanguage() != null)
-		{
-			String nn = getTrlName();
-			if (nn != null)
-				return nn;
-		}
-		return getName();
+		return getTrlName();
 	}   //  toString
 
 	/**
@@ -256,13 +236,7 @@ public class MCountry extends X_C_Country
 	 */
 	public String getTrlName()
 	{
-		if (m_trlName == null && getEnvLanguage() != null)
-		{
-			m_trlName = get_Translation(COLUMNNAME_Name, getEnvLanguage());
-			if (m_trlName == null)
-				m_trlName = getName();
-		}
-		return m_trlName;
+		return getTrlName(Env.getAD_Language(Env.getCtx()));
 	}	//	getTrlName
 	
 	/**
@@ -272,11 +246,7 @@ public class MCountry extends X_C_Country
 	 */
 	public String getTrlName(String language)
 	{
-		if ( language != null)
-		{
-			m_trlName = get_Translation(COLUMNNAME_Name, language);
-		}
-		return m_trlName;
+		return get_Translation(COLUMNNAME_Name, language);
 	}	//	getTrlName