diff --git a/serverRoot/src/main/server/org/compiere/server/Scheduler.java b/serverRoot/src/main/server/org/compiere/server/Scheduler.java
index 62afa43d85..50019624be 100644
--- a/serverRoot/src/main/server/org/compiere/server/Scheduler.java
+++ b/serverRoot/src/main/server/org/compiere/server/Scheduler.java
@@ -301,7 +301,8 @@ public class Scheduler extends AdempiereServer
 					if (variable == null
 						|| (variable != null && variable.length() == 0))
 						value = null;
-					else if (variable.startsWith("@") && variable.endsWith("@"))	//	we have a variable / BF [1926032]
+					else if (  variable.indexOf('@') != -1
+							&& variable.indexOf('@') != variable.lastIndexOf('@'))	//	we have a variable / BF [1926032]
 					{
 						//	Strip
 						int index = variable.indexOf('@');