diff --git a/backend.native/build.gradle b/backend.native/build.gradle
index eb9b7216860..b0803ab52ab 100644
--- a/backend.native/build.gradle
+++ b/backend.native/build.gradle
@@ -196,8 +196,7 @@ targetList.each { target ->
     "-Dfile.encoding=UTF-8"]
 
     def defaultArgs = ['-nopack', '-nostdlib', '-nodefaultlibs', '-ea' ]
-    // FIXME: disabled temporary while it fails to build with debug info
-//    if (target != "wasm32") defaultArgs += '-g'
+    if (target != "wasm32") defaultArgs += '-g'
     def konanArgs = [*defaultArgs,
                      '-target', target,
                      "-Xruntime=${project(':runtime').file('build/' + target +'/runtime.bc')}",
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/ModuleIndex.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/ModuleIndex.kt
index 95ffe99fa59..98999c2333f 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/ModuleIndex.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/ModuleIndex.kt
@@ -63,7 +63,7 @@ class ModuleIndex(val module: IrModuleFragment) {
 
             override fun visitDeclaration(declaration: IrDeclaration) {
                 super.visitDeclaration(declaration)
-                declarationToFile[declaration.descriptor] = currentFile!!.name
+                declarationToFile[declaration.descriptor] = currentFile!!.path
             }
         })