diff --git a/README.md b/README.md
index 4a07b0b..75023a9 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,12 @@ configure({
 
 ## Release Notes
 
+## [1.6.1] - 2021-05-22
+
+### Fixed
+
+- Fix the automatic formatting in files where types are inserted
+
 ## [1.6.0] - 2021-05-20
 
 ### Added
diff --git a/packages/extension/package-lock.json b/packages/extension/package-lock.json
index e11dca3..df1fc81 100644
--- a/packages/extension/package-lock.json
+++ b/packages/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "typehole",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "typehole",
-      "version": "1.6.0",
+      "version": "1.6.1",
       "dependencies": {
         "@phenomnomnominal/tsquery": "^4.1.1",
         "@types/esquery": "^1.0.1",
diff --git a/packages/extension/package.json b/packages/extension/package.json
index ad6a4b1..f898baf 100644
--- a/packages/extension/package.json
+++ b/packages/extension/package.json
@@ -4,7 +4,7 @@
   "publisher": "rikurouvila",
   "description": "🧪  Take samples of runtime values and turn them into type definitions automatically",
   "repository": "https://github.com/rikukissa/typehole",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "private": true,
   "icon": "images/logo.png",
   "galleryBanner": {
diff --git a/packages/extension/src/listener.ts b/packages/extension/src/listener.ts
index 8990189..7903a3d 100644
--- a/packages/extension/src/listener.ts
+++ b/packages/extension/src/listener.ts
@@ -35,13 +35,7 @@ function createServer() {
 
   fastify.post("/samples", async (request, reply) => {
     const body = request.body as any;
-    log(
-      body.id,
-      "-",
-      "New sample",
-      JSON.stringify(request.body).substr(0, 30),
-      "received"
-    );
+    log(body.id, "-", "New sample", JSON.stringify(request.body), "received");
 
     const samples = addSample(body.id, body.sample);
     const typeString = samplesToType(samples);
@@ -200,7 +194,16 @@ async function updateTypes(hole: Typehole, types: string, fileName: string) {
   vscode.workspace.applyEdit(workEdits);
 
   try {
-    await vscode.commands.executeCommand("editor.action.formatDocument");
+    const workEdits = new vscode.WorkspaceEdit();
+    const edits = await vscode.commands.executeCommand<vscode.TextEdit[]>(
+      "vscode.executeFormatDocumentProvider",
+      document.uri
+    );
+
+    if (edits) {
+      workEdits.set(document.uri, edits);
+      vscode.workspace.applyEdit(workEdits);
+    }
   } catch (err) {
     error("Formatting the document failed", err.message);
   }
diff --git a/packages/runtime/package-lock.json b/packages/runtime/package-lock.json
index 844e04c..ddb267b 100644
--- a/packages/runtime/package-lock.json
+++ b/packages/runtime/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "typehole",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "typehole",
-      "version": "1.5.1",
+      "version": "1.6.1",
       "license": "MIT",
       "dependencies": {
         "@types/isomorphic-fetch": "0.0.35",
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index a67a7c3..15370ff 100644
--- a/packages/runtime/package.json
+++ b/packages/runtime/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.6.0",
+  "version": "1.6.1",
   "name": "typehole",
   "repository": "rikukissa/typehole",
   "description": "Turn runtime types into static typescript types automatically",