diff --git a/CHANGELOG.md b/CHANGELOG.md
index e53b2983d..913a43e69 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda
 
 ### v1.10.1
 
+**v1.10.1.9** *(2015-02-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.9/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.10.0.6: Fix bugs when `Fixed Header` is off but `Bottom Header` is on.
+
 **v1.10.1.8** *(2015-02-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.1.8/builds/4chan-X-noupdate.crx "Chromium version")]
 - Another settings bugfix.
 
diff --git a/LICENSE b/LICENSE
index fa44cd003..02870f8fb 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.10.1.8
+* 4chan X - Version 1.10.1.9
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 223ff8acd..bd2ffc416 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index 2d3d4addd..3f3beab81 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.10.1.8
+// @version      1.10.1.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 8dec47d55..26544ffb3 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.10.1.8
+// @version      1.10.1.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.10.1.8
+* 4chan X - Version 1.10.1.9
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -405,7 +405,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.1.8',
+    VERSION: '1.10.1.9',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -2886,7 +2886,7 @@
       var height, x;
       if (down) {
         x = Header.getBottomOf(root);
-        if (Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
+        if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
           height = Header.bar.getBoundingClientRect().height;
           if (x <= 0) {
             if (!Header.isHidden()) {
@@ -2903,7 +2903,7 @@
         }
       } else {
         x = Header.getTopOf(root);
-        if (Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
+        if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
           height = Header.bar.getBoundingClientRect().height;
           if (x >= 0) {
             if (!Header.isHidden()) {
@@ -2936,7 +2936,7 @@
       var bottom, clientHeight, headRect;
       clientHeight = doc.clientHeight;
       bottom = clientHeight - root.getBoundingClientRect().bottom;
-      if (Conf['Bottom Header']) {
+      if (Conf['Fixed Header'] && Conf['Bottom Header']) {
         headRect = Header.toggle.getBoundingClientRect();
         bottom -= clientHeight - headRect.bottom + headRect.height;
       }
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 343d071ff..d1b384685 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index be5caf9af..e20e4b2bc 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.10.1.8
+// @version      1.10.1.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.10.1.8
+* 4chan X - Version 1.10.1.9
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -404,7 +404,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.1.8',
+    VERSION: '1.10.1.9',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -2885,7 +2885,7 @@
       var height, x;
       if (down) {
         x = Header.getBottomOf(root);
-        if (Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
+        if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
           height = Header.bar.getBoundingClientRect().height;
           if (x <= 0) {
             if (!Header.isHidden()) {
@@ -2902,7 +2902,7 @@
         }
       } else {
         x = Header.getTopOf(root);
-        if (Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
+        if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
           height = Header.bar.getBoundingClientRect().height;
           if (x >= 0) {
             if (!Header.isHidden()) {
@@ -2935,7 +2935,7 @@
       var bottom, clientHeight, headRect;
       clientHeight = doc.clientHeight;
       bottom = clientHeight - root.getBoundingClientRect().bottom;
-      if (Conf['Bottom Header']) {
+      if (Conf['Fixed Header'] && Conf['Bottom Header']) {
         headRect = Header.toggle.getBoundingClientRect();
         bottom -= clientHeight - headRect.bottom + headRect.height;
       }
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 7d0d756b9..1abfe8f8d 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 912b36174..5e1488526 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.10.1.8
+// @version      1.10.1.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 0a32960fc..ef9aff59b 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.10.1.8
+// @version      1.10.1.9
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.10.1.8
+* 4chan X - Version 1.10.1.9
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -405,7 +405,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.10.1.8',
+    VERSION: '1.10.1.9',
     NAMESPACE: '4chan X.',
     NAME: '4chan X',
     FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -2886,7 +2886,7 @@
       var height, x;
       if (down) {
         x = Header.getBottomOf(root);
-        if (Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
+        if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && Conf['Bottom header']) {
           height = Header.bar.getBoundingClientRect().height;
           if (x <= 0) {
             if (!Header.isHidden()) {
@@ -2903,7 +2903,7 @@
         }
       } else {
         x = Header.getTopOf(root);
-        if (Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
+        if (Conf['Fixed Header'] && Conf['Header auto-hide on scroll'] && !Conf['Bottom header']) {
           height = Header.bar.getBoundingClientRect().height;
           if (x >= 0) {
             if (!Header.isHidden()) {
@@ -2936,7 +2936,7 @@
       var bottom, clientHeight, headRect;
       clientHeight = doc.clientHeight;
       bottom = clientHeight - root.getBoundingClientRect().bottom;
-      if (Conf['Bottom Header']) {
+      if (Conf['Fixed Header'] && Conf['Bottom Header']) {
         headRect = Header.toggle.getBoundingClientRect();
         bottom -= clientHeight - headRect.bottom + headRect.height;
       }
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 82b55ebf4..a91715c04 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 03d2e0195..0ca8b3133 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.1.8' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.10.1.9' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index d8cf117b4..da3e87211 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.1.8' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.10.1.9' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 97dcae1ab..3d0523a9f 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.10.1.8",
+    "version": "1.10.1.9",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",