diff --git a/framework/src/play/PropertiesConfLoader.java b/framework/src/play/PropertiesConfLoader.java
index bb73deac..e8f1626e 100644
--- a/framework/src/play/PropertiesConfLoader.java
+++ b/framework/src/play/PropertiesConfLoader.java
@@ -138,7 +138,8 @@ private void resolveIncludes(
     for (Map.Entry<Object, Object> e : propsFromFile.entrySet()) {
       if (e.getKey().toString().startsWith("@include.")) {
         try {
-          String filenameToInclude = e.getValue().toString();
+          String value = e.getValue().toString();
+          String filenameToInclude = !value.startsWith("/") ? filePrefix + value : value;
           propsFromFile.putAll(
               readOneConfigurationFile(filenameToInclude, playId, inheritedId, confs));
         } catch (Exception ex) {