diff --git a/src/main/scala/net/kogics/kojo/lite/Versions.scala b/src/main/scala/net/kogics/kojo/lite/Versions.scala
index b72d03dd..074ed307 100644
--- a/src/main/scala/net/kogics/kojo/lite/Versions.scala
+++ b/src/main/scala/net/kogics/kojo/lite/Versions.scala
@@ -3,8 +3,8 @@ package net.kogics.kojo.lite
 object Versions {
   val KojoMajorVersion = "2.7"
   val KojoVersion = "2.7.07"
-  val KojoRevision = "r7"
-  val KojoBuildDate = "17 September 2019"
+  val KojoRevision = "r8"
+  val KojoBuildDate = "02 October 2019"
   val JavaVersion = {
     val jrv = System.getProperty("java.runtime.version")
     val arch = System.getProperty("os.arch")
diff --git a/src/main/scala/net/kogics/kojo/util/Utils.scala b/src/main/scala/net/kogics/kojo/util/Utils.scala
index 7858a2af..ca8772b5 100644
--- a/src/main/scala/net/kogics/kojo/util/Utils.scala
+++ b/src/main/scala/net/kogics/kojo/util/Utils.scala
@@ -716,19 +716,20 @@ object Utils {
       def countLines(s: String) = s.count(_ == '\n')
       val includes = """//\s*#include.*""".r.findAllIn(code)
       def getFileName(s: String) = """//\s*#include""".r.replaceFirstIn(s, "").trim
-      def expand(fileName: String) = {
-        val suffix = if (!fileName.contains(".")) ".kojo" else ""
-        absolutePath(fileName + suffix)
+      def addKojoExtension(fileName: String) = {
+        val justFileName = new File(fileName).getName
+        if (!justFileName.contains(".")) fileName + ".kojo" else fileName
       }
       def load(fileName0: String): String = {
-        val fileName = expand(fileName0)
+        val fileNameDotKojo = addKojoExtension(fileName0)
+        val fileName = absolutePath(fileNameDotKojo)
         def readFileContent = {
           val file = new File(fileName)
           if (file.exists) {
             stripCR(file.readAsString)
           }
           else {
-            val res = loadResource(fileName)
+            val res = loadResource(fileNameDotKojo)
             if (res == null) {
               file.readAsString // trigger exception
             }