diff --git a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
index 663513052a..b7df9455b7 100644
--- a/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
+++ b/dbPort/src/org/compiere/dbPort/Convert_PostgreSQL.java
@@ -1530,20 +1530,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 		if (table != null && alias != null ) {
 			if (alias.indexOf("(") > 0) alias = alias.substring(0, alias.indexOf("("));
 			String converted = sqlStatement.replaceFirst("\\s"+alias+"\\s", " ");
-			converted = converted.replaceAll("\\s"+alias+"\\.", " " + table+".");
-			converted = converted.replaceAll(","+alias+"\\.", "," + table+".");
-			converted = converted.replaceAll("\\("+alias+"\\.", "(" + table+".");
-			converted = converted.replaceAll("\\+"+alias+"\\.", "+" + table+".");
-			converted = converted.replaceAll("\\-"+alias+"\\.", "-" + table+".");
-			converted = converted.replaceAll("\\*"+alias+"\\.", "*" + table+".");
-			converted = converted.replaceAll("/"+alias+"\\.", "/" + table+".");
-			converted = converted.replaceAll("%"+alias+"\\.", "%" + table+".");
-			converted = converted.replaceAll("="+alias+"\\.", "=" + table+".");
-			converted = converted.replaceAll("<>"+alias+"\\.", "<>" + table+".");
-			converted = converted.replaceAll(">"+alias+"\\.", ">" + table+".");
-			converted = converted.replaceAll("<"+alias+"\\.", "<" + table+".");
-			converted = converted.replaceAll("<="+alias+"\\.", "<=" + table+".");
-			converted = converted.replaceAll(">="+alias+"\\.", ">=" + table+".");
+			converted = converted.replaceAll("\\b"+alias+"\\.", table+".");
 			return converted;
 		} else {
 			return sqlStatement;