diff --git a/package-lock.json b/package-lock.json
index 686eeb4..181b7b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "naadan-chords",
-  "version": "0.80.6",
+  "version": "0.80.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "naadan-chords",
-      "version": "0.80.6",
+      "version": "0.80.7",
       "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^1.2.34",
         "@fortawesome/free-brands-svg-icons": "^5.15.2",
diff --git a/package.json b/package.json
index c720422..834b257 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "naadan-chords",
-  "version": "0.80.6",
+  "version": "0.80.7",
   "homepage": "https://www.naadanchords.com/",
   "private": true,
   "dependencies": {
diff --git a/src/containers/ContentParser.js b/src/containers/ContentParser.js
index 33d6860..cd13026 100644
--- a/src/containers/ContentParser.js
+++ b/src/containers/ContentParser.js
@@ -130,21 +130,6 @@ export default class ContentParser extends Component {
     //Chords regex
     const notes = "[CDEFGAB]";
     const tabBeginning = "(?!\\|)";
-    const fretNumbers = [
-      "0",
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "7",
-      "8",
-      "9",
-      "10",
-      "11",
-      "12",
-    ];
     const chords =
       "(maj7|maj|min7|min|sus2|sus4|m7|m6add9|m7sus2|6sus2|7sus4|add9|add4|5add14|m|5|6|7|dim)?";
     const flat = "(b)?";
@@ -176,12 +161,18 @@ export default class ContentParser extends Component {
           tabLineStrings[i] = tabLineStrings[i].replace(
             tabsFretNumbersOnlyRegex,
             (match, p1, originalFretPosition) => {
-              const i =
-                (Number(originalFretPosition) + this.state.transposeAmount) %
-                fretNumbers.length;
-              let newFretPosition = `${
-                fretNumbers[i < 0 ? i + fretNumbers.length : i]
-              }`;
+              let newFretPosition =
+                Number(originalFretPosition) + this.state.transposeAmount;
+
+              if (newFretPosition < 0) {
+                newFretPosition = newFretPosition + 12;
+              }
+
+              if (newFretPosition > 17) {
+                newFretPosition = newFretPosition - 12;
+              }
+
+              newFretPosition = `${newFretPosition}`;
               return p1 + newFretPosition;
             }
           );