diff --git a/src/Mod/OpenSCAD/importCSG.py b/src/Mod/OpenSCAD/importCSG.py
index 9a59a8b6c..623650fd9 100644
--- a/src/Mod/OpenSCAD/importCSG.py
+++ b/src/Mod/OpenSCAD/importCSG.py
@@ -100,8 +100,11 @@ def insert(filename,docname):
     importgroup = doc.addObject("App::DocumentObjectGroup",groupname)
     if filename.lower().endswith('.scad'):
         tmpfile=callopenscad(filename)
-        pathName = '' #https://github.com/openscad/openscad/issues/128
-        #pathName = os.getcwd() #https://github.com/openscad/openscad/issues/128
+        if workaroundforissue128needed():
+            pathName = '' #https://github.com/openscad/openscad/issues/128
+            #pathName = os.getcwd() #https://github.com/openscad/openscad/issues/128
+        else:
+            pathName = os.path.dirname(os.path.normpath(filename))
         processcsg(tmpfile)
         try:
             os.unlink(tmpfile)