diff --git a/package-lock.json b/package-lock.json
index f12ed22..061066b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -794,9 +794,10 @@
       "license": "MIT"
     },
     "node_modules/@swc/core": {
-      "version": "1.3.102",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.4.0.tgz",
+      "integrity": "sha512-wc5DMI5BJftnK0Fyx9SNJKkA0+BZSJQx8430yutWmsILkHMBD3Yd9GhlMaxasab9RhgKqZp7Ht30hUYO5ZDvQg==",
       "hasInstallScript": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.1",
         "@swc/types": "^0.1.5"
@@ -809,16 +810,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.3.102",
-        "@swc/core-darwin-x64": "1.3.102",
-        "@swc/core-linux-arm-gnueabihf": "1.3.102",
-        "@swc/core-linux-arm64-gnu": "1.3.102",
-        "@swc/core-linux-arm64-musl": "1.3.102",
-        "@swc/core-linux-x64-gnu": "1.3.102",
-        "@swc/core-linux-x64-musl": "1.3.102",
-        "@swc/core-win32-arm64-msvc": "1.3.102",
-        "@swc/core-win32-ia32-msvc": "1.3.102",
-        "@swc/core-win32-x64-msvc": "1.3.102"
+        "@swc/core-darwin-arm64": "1.4.0",
+        "@swc/core-darwin-x64": "1.4.0",
+        "@swc/core-linux-arm-gnueabihf": "1.4.0",
+        "@swc/core-linux-arm64-gnu": "1.4.0",
+        "@swc/core-linux-arm64-musl": "1.4.0",
+        "@swc/core-linux-x64-gnu": "1.4.0",
+        "@swc/core-linux-x64-musl": "1.4.0",
+        "@swc/core-win32-arm64-msvc": "1.4.0",
+        "@swc/core-win32-ia32-msvc": "1.4.0",
+        "@swc/core-win32-x64-msvc": "1.4.0"
       },
       "peerDependencies": {
         "@swc/helpers": "^0.5.0"
@@ -829,12 +830,148 @@
         }
       }
     },
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.0.tgz",
+      "integrity": "sha512-UTJ/Vz+s7Pagef6HmufWt6Rs0aUu+EJF4Pzuwvr7JQQ5b1DZeAAUeUtkUTFx/PvCbM8Xfw4XdKBUZfrIKCfW8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.0.tgz",
+      "integrity": "sha512-f8v58u2GsGak8EtZFN9guXqE0Ep10Suny6xriaW2d8FGqESPyNrnBzli3aqkSeQk5gGqu2zJ7WiiKp3XoUOidA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.0.tgz",
+      "integrity": "sha512-q2KAkBzmPcTnRij/Y1fgHCKAGevUX/H4uUESrw1J5gmUg9Qip6onKV80lTumA1/aooGJ18LOsB31qdbwmZk9OA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.0.tgz",
+      "integrity": "sha512-SknGu96W0mzHtLHWm+62fk5+Omp9fMPFO7AWyGFmz2tr8EgRRXtTSrBUnWhAbgcalnhen48GsvtMdxf1KNputg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.0.tgz",
+      "integrity": "sha512-/k3TDvpBRMDNskHooNN1KqwUhcwkfBlIYxRTnJvsfT2C7My4pffR+4KXmt0IKynlTTbCdlU/4jgX4801FSuliw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.0.tgz",
+      "integrity": "sha512-GYsTMvNt5+WTVlwwQzOOWsPMw6P/F41u5PGHWmfev8Nd4QJ1h3rWPySKk4mV42IJwH9MgQCVSl3ygwNqwl6kFg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.0.tgz",
+      "integrity": "sha512-jGVPdM/VwF7kK/uYRW5N6FwzKf/FnDjGIR3RPvQokjYJy7Auk+3Oj21C0Jev7sIT9RYnO/TrFEoEozKeD/z2Qw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.0.tgz",
+      "integrity": "sha512-biHYm1AronEKlt47O/H8sSOBM2BKXMmWT+ApvlxUw50m1RGNnVnE0bgY7tylFuuSiWyXsQPJbmUV708JqORXVg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.0.tgz",
+      "integrity": "sha512-TL5L2tFQb19kJwv6+elToGBj74QXCn9j+hZfwQatvZEJRA5rDK16eH6oAE751dGUArhnWlW3Vj65hViPvTuycw==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.3.102",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.0.tgz",
+      "integrity": "sha512-e2xVezU7XZ2Stzn4i7TOQe2Kn84oYdG0M3A7XI7oTdcpsKCcKwgiMoroiAhqCv+iN20KNqhnWwJiUiTj/qN5AA==",
       "cpu": [
         "x64"
       ],
-      "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
         "win32"
@@ -844,8 +981,9 @@
       }
     },
     "node_modules/@swc/counter": {
-      "version": "0.1.2",
-      "license": "Apache-2.0"
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="
     },
     "node_modules/@swc/types": {
       "version": "0.1.5",
diff --git a/src/terminal/locator.ts b/src/terminal/locator.ts
index 7f35da8..1c3be4d 100644
--- a/src/terminal/locator.ts
+++ b/src/terminal/locator.ts
@@ -95,7 +95,8 @@ export class Locator {
         this._cells = [];
         for (let y = 0; y < buffer.length; y++) {
           for (let x = 0; x < buffer[y].length ?? 0; x++) {
-            if (x + y >= index && x + y < index + length) {
+            const pos = x + y * buffer[y].length;
+            if (pos >= index && pos < index + length) {
               this._cells.push({
                 termCell: this._xterm.buffer.active
                   .getLine(baseY + y)
diff --git a/test/e2e.test.ts b/test/e2e.test.ts
index cb7e18b..a21b828 100644
--- a/test/e2e.test.ts
+++ b/test/e2e.test.ts
@@ -213,8 +213,9 @@ test.describe("color detection", () => {
     os.platform() === "linux",
     "checks background color",
     async ({ terminal }) => {
-      terminal.write(String.raw`printf \033[41mHello\n\033[0m\r`);
-      await expect(terminal.getByText("Hello ")).toHaveBgColor(41);
+      terminal.write(String.raw`printf "\x1b[42m%s%s\n\x1b[0m" foo bar`);
+      terminal.write("\r");
+      await expect(terminal.getByText("foobar")).toHaveBgColor(2);
     }
   );
 
@@ -222,8 +223,9 @@ test.describe("color detection", () => {
     os.platform() === "linux",
     "checks foreground color",
     async ({ terminal }) => {
-      terminal.write(String.raw`printf \033[31mHello\n\033[0m\r`);
-      await expect(terminal.getByText("Hello ")).toHaveFgColor(31);
+      terminal.write(String.raw`printf "\x1b[41m%s%s\n\x1b[0m" foo bar`);
+      terminal.write("\r");
+      await expect(terminal.getByText("foobar")).toHaveFgColor(1);
     }
   );