diff --git a/libs/matdbg/src/DebugServer.cpp b/libs/matdbg/src/DebugServer.cpp
index 9285bc38c5..f7a16ba3e5 100644
--- a/libs/matdbg/src/DebugServer.cpp
+++ b/libs/matdbg/src/DebugServer.cpp
@@ -273,8 +273,7 @@ bool DebugServer::handleEditCommand(const MaterialKey& key, backend::Backend api
     }
 
     const ShaderInfo info = infos[shaderIndex];
-    if (!editor.replaceShaderSource(info.shaderModel, info.variant, info.pipelineStage, source,
-            size)) {
+    if (!editor.replaceShaderSource(info.shaderModel, info.variant, info.pipelineStage, source, size)) {
         return error(__LINE__);
     }
 
diff --git a/libs/matdbg/src/ShaderReplacer.cpp b/libs/matdbg/src/ShaderReplacer.cpp
index 7716426fdd..59e2b1e8ad 100644
--- a/libs/matdbg/src/ShaderReplacer.cpp
+++ b/libs/matdbg/src/ShaderReplacer.cpp
@@ -373,6 +373,7 @@ void ShaderIndex::writeChunks(ostream& stream) {
     for (const auto& record : mShaderRecords) {
         lines.addText(record.stage, record.shader);
     }
+    lines.resolve();
     sortRecords(mShaderRecords);
 
     filamat::ChunkContainer cc;