diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbf6f67..27b9a64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Change Log
 
-## **3.0.10** released on 9th October 2018
+## **3.0.10** released on 11th October 2018
 
+- **Fix:** Huge delay in extensions using key bindings contributions ([#225](https://github.com/bartosz-antosik/vscode-spellright/issues/225)).
 - **Fix:** Manually changing settings does not modify them in some cases ([#226](https://github.com/bartosz-antosik/vscode-spellright/issues/226)).
 
 ## **3.0.6** released on 22nd October 2018
diff --git a/lib/parsers/code.js b/lib/parsers/code.js
index 5443f73..000e395 100644
--- a/lib/parsers/code.js
+++ b/lib/parsers/code.js
@@ -44,7 +44,7 @@ class Code extends Parser.default {
         }
 
         // Remove e-mail addresses
-        re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
+        var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
         while (match = re.exec(text)) {
             var replace = ' '.repeat(match[0].length);
             text = Parser.replaceAt(text, match.index, replace);
@@ -52,7 +52,7 @@ class Code extends Parser.default {
 
         if (document.languageId === 'pascal') {
             // Remove compiler directives in comments
-            re = /\{\$.+?\}/gm;
+            var re = /\{\$.+?\}/gm;
             while (match = re.exec(text)) {
                 var replace = ' '.repeat(match[0].length);
                 text = Parser.replaceAt(text, match.index, replace);
@@ -61,7 +61,7 @@ class Code extends Parser.default {
 
         if (document.languageId === 'elixir') {
             // Remove compiler directives in comments
-            re = /.*(iex|\.\.\.)>.*/gm;
+            var re = /.*(iex|\.\.\.)>.*/gm;
             while (match = re.exec(text)) {
                 var replace = ' '.repeat(match[0].length);
                 text = Parser.replaceAt(text, match.index, replace);
diff --git a/lib/parsers/latex.js b/lib/parsers/latex.js
index 105d9ef..e15c560 100644
--- a/lib/parsers/latex.js
+++ b/lib/parsers/latex.js
@@ -125,7 +125,7 @@ class LaTeX extends Parser.default {
         }
 
         // Remove e-mail addresses
-        re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
+        var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
         while (match = re.exec(text)) {
             var replace = ' '.repeat(match[0].length);
             text = Parser.replaceAt(text, match.index, replace);
diff --git a/lib/parsers/markdown.js b/lib/parsers/markdown.js
index cbcc7a8..5e78ba3 100644
--- a/lib/parsers/markdown.js
+++ b/lib/parsers/markdown.js
@@ -30,14 +30,14 @@ class Markdown extends Parser.default {
         }
 
         // Remove links from inside []() construct
-        re = /(\[.*\])(\(.*\))/g;
+        var re = /(\[.*\])(\(.*\))/g;
         while (match = re.exec(text)) {
             var replace = '_'.repeat(match[2].length);
             text = Parser.replaceAt(text, match.index + match[1].length, replace);
         }
 
         // Remove XML/HTML tags
-        re = /<[\w\/][^>]+>/g;
+        var re = /<[\w\/][^>]+>/g;
         while (match = re.exec(text)) {
             // Check whether not inside comment, if so, leave.
             var ce = /<!--[^>]*-->/g;
@@ -60,7 +60,7 @@ class Markdown extends Parser.default {
 
         if (document.languageId === 'asciidoc') {
             // Attributes (:name: value) except some (e.g. :summary:)
-            re = /^:(\w[\w\d]*):.*$/gm;
+            var re = /^:(\w[\w\d]*):.*$/gm;
             while (match = re.exec(text)) {
                 if (match[1] !== 'summary') {
                     var replace = '_'.repeat(match[0].length);
@@ -68,7 +68,7 @@ class Markdown extends Parser.default {
                 }
             }
             // Options ([...])
-            re = /^\[.*\]$/gm;
+            var re = /^\[.*\]$/gm;
             while (match = re.exec(text)) {
                 var replace = '_'.repeat(match[0].length);
                 text = Parser.replaceAt(text, match.index, replace);
@@ -78,7 +78,7 @@ class Markdown extends Parser.default {
         if (document.languageId === 'restructuredtext') {
             // Remove reStructuredText directives relative to code blocks
             // with this RegExp: https://regex101.com/r/GJXToz/2
-            re = /^\.\. (code-block|highlight).*($\s{4,}.*)*/gm;
+            var re = /^\.\. (code-block|highlight).*($\s{4,}.*)*/gm;
             while (match = re.exec(text)) {
                 var replace = match[0].replace(/(?:[^\r\n]|\r(?!\n))/g, '_');
                 text = Parser.replaceAt(text, match.index, replace);
@@ -93,7 +93,7 @@ class Markdown extends Parser.default {
         var match;
 
         // Remove inline code sections
-        re = /`[^\n`]+`/g;
+        var re = /`[^\n`]+`/g;
         while (match = re.exec(text)) {
             var replace = '_'.repeat(match[0].length);
             text = Parser.replaceAt(text, match.index, replace);
@@ -107,7 +107,7 @@ class Markdown extends Parser.default {
         }
 
         // Remove e-mail addresses
-        re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
+        var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
         while (match = re.exec(text)) {
             var replace = '_'.repeat(match[0].length);
             text = Parser.replaceAt(text, match.index, replace);
diff --git a/lib/parsers/plaintext.js b/lib/parsers/plaintext.js
index a81bfa8..78d26b5 100644
--- a/lib/parsers/plaintext.js
+++ b/lib/parsers/plaintext.js
@@ -26,7 +26,7 @@ class Plaintext extends Parser.default {
         }
 
         if (document.languageId === 'mediawiki') {
-            re = /(<([^>]+)>)/ig;
+            var re = /(<([^>]+)>)/ig;
             while (match = re.exec(text)) {
                 var replace = ' '.repeat(match[0].length);
                 text = Parser.replaceAt(text, match.index, replace);
@@ -48,7 +48,7 @@ class Plaintext extends Parser.default {
         }
 
         // Remove e-mail addresses
-        re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
+        var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
         while (match = re.exec(text)) {
             var replace = ' '.repeat(match[0].length);
             text = Parser.replaceAt(text, match.index, replace);
@@ -56,13 +56,13 @@ class Plaintext extends Parser.default {
 
         if (document.languageId === 'git-commit' || document.languageId === 'git-rebase') {
             // Remove tail part after `# ------------------------ >8 -...`
-            re = /\# -[-]+ >8 -[-][\s\S]*/gm;
+            var re = /\# -[-]+ >8 -[-][\s\S]*/gm;
             while (match = re.exec(text)) {
                 var replace = ' '.repeat(match[0].length);
                 text = Parser.replaceAt(text, match.index, replace);
             }
             // Remove line comments `# ...`
-            re = /#.*$/gm;
+            var re = /#.*$/gm;
             while (match = re.exec(text)) {
                 var replace = ' '.repeat(match[0].length);
                 text = Parser.replaceAt(text, match.index, replace);
diff --git a/lib/parsers/xml.js b/lib/parsers/xml.js
index 387781b..72f62f5 100644
--- a/lib/parsers/xml.js
+++ b/lib/parsers/xml.js
@@ -51,7 +51,7 @@ class Xml extends Parser.default {
         }
 
         // Remove e-mail addresses
-        re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
+        var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
         while (match = re.exec(text)) {
             var replace = ' '.repeat(match[0].length);
             text = Parser.replaceAt(text, match.index, replace);
diff --git a/src/spellright.js b/src/spellright.js
index 2bc5d64..026d7b0 100644
--- a/src/spellright.js
+++ b/src/spellright.js
@@ -1099,8 +1099,8 @@ var SpellRight = (function () {
                 // Adjust diagnostics behind changed lines range BEFORE
                 if (shift != 0) {
                     if (_drange._end._line > range._end._line) {
-                        _drange._start._line += shift;
-                        _drange._end._line += shift;
+                        diagnostics[i].range._start._line += shift;
+                        diagnostics[i].range._end._line += shift;
                     }
                 }
             }