diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java
index 8af8461b80..b83c181f0f 100644
--- a/org.adempiere.base/src/org/compiere/model/MQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/MQuery.java
@@ -1025,10 +1025,10 @@ class Restriction  implements Serializable
 		//	clean code
 		if (Code instanceof String)
 		{
-			if (Code.toString().startsWith("'"))
+			if (Code.toString().startsWith("'") && Code.toString().endsWith("'")) {
 				Code = Code.toString().substring(1);
-			if (Code.toString().endsWith("'"))
 				Code = Code.toString().substring(0, Code.toString().length()-2);
+			}
 		}
 		if (infoDisplay != null)
 			InfoDisplay = infoDisplay.trim();