diff --git a/jpos/src/main/java/org/jpos/transaction/participant/SelectDestination.java b/jpos/src/main/java/org/jpos/transaction/participant/SelectDestination.java
index ba672e5bcd..70211593a4 100644
--- a/jpos/src/main/java/org/jpos/transaction/participant/SelectDestination.java
+++ b/jpos/src/main/java/org/jpos/transaction/participant/SelectDestination.java
@@ -101,7 +101,7 @@ public void setConfiguration (Configuration cfg) {
     public void setConfiguration(Element xml) throws ConfigurationException {
         for (Element ep : xml.getChildren("endpoint")) {
             String destination = QFactory.getAttributeValue(ep, "destination");
-            StringTokenizer st = new StringTokenizer(ep.getText());
+            StringTokenizer st = new StringTokenizer(Environment.get(ep.getTextTrim()));
             while (st.hasMoreElements()) {
                 BinRange br = new BinRange(destination, st.nextToken());
                 binranges.add(br);
@@ -110,7 +110,7 @@ public void setConfiguration(Element xml) throws ConfigurationException {
         for (Element re : xml.getChildren("regexp")) {
             String destination = QFactory.getAttributeValue(re, "destination");
             regexps.add(
-              new PanRegExp(QFactory.getAttributeValue(re, "destination"), re.getTextTrim())
+              new PanRegExp(QFactory.getAttributeValue(re, "destination"), Environment.get(re.getTextTrim()))
             );
         }
         LogEvent evt = Log.getLog(Q2.LOGGER_NAME, this.getClass().getName()).createLogEvent("config");