diff --git a/base/src/org/compiere/dbPort/Convert_PostgreSQL.java b/base/src/org/compiere/dbPort/Convert_PostgreSQL.java
index af3cacd38d..6968bc6cac 100644
--- a/base/src/org/compiere/dbPort/Convert_PostgreSQL.java
+++ b/base/src/org/compiere/dbPort/Convert_PostgreSQL.java
@@ -621,7 +621,7 @@ public class Convert_PostgreSQL extends Convert_SQL92 {
 					fj = Util.findIndexOf(joinFields, ',');
 					// fieldsjoin.indexOf(',');
 
-					joinField = joinFields.substring(0, fj).trim();
+					joinField = fj > 0 ? joinFields.substring(0, fj).trim() : joinFields.trim();
 					if (joinField.indexOf('.') < 0 && isIdentifier(joinField)) {
 						joinField = joinAlias + "." + joinField;
 					}