diff --git a/changelog.html b/changelog.html
old mode 100644
new mode 100755
index cb8ba828fa..cf4b20df9e
--- a/changelog.html
+++ b/changelog.html
@@ -1,4 +1,8 @@
-<span>07.17.2014 - 0.47</span>
+<span>07.06.2014 - cleanflight</span>
+<p>
+    - Fix auxiliary configuration tab when using parallel pwm.<br />
+</p>
+</p><span>07.17.2014 - 0.47</span>
 <p>
     - Bugfixes related to Chrome 36+ release<br />
     - Various optimizations and behavior improvements<br />
diff --git a/tabs/auxiliary_configuration.js b/tabs/auxiliary_configuration.js
old mode 100644
new mode 100755
index 5f2c37624e..fa73fcedd0
--- a/tabs/auxiliary_configuration.js
+++ b/tabs/auxiliary_configuration.js
@@ -48,7 +48,7 @@ tabs.auxiliary_configuration.initialize = function(callback) {
 
             var bitIndex = 0;
             var chunks = 1;
-            if (bit_check(CONFIG.capability, 5)) {
+            if (bit_check(CONFIG.capability, 5) && (RC.active_channels - 4) > 4) {
                 chunks = 2;
             }
             var channelsPerChunk = 4;
@@ -76,7 +76,7 @@ tabs.auxiliary_configuration.initialize = function(callback) {
 
             var boxCountFor4AuxChannels = 3 * 4;
             var boxCountPerLine = boxCountFor4AuxChannels;
-            if (bit_check(CONFIG.capability, 5)) {
+            if (bit_check(CONFIG.capability, 5) && (RC.active_channels - 4) > 4) {
                 boxCountPerLine = boxCountFor4AuxChannels * 2;
             }
 
@@ -107,7 +107,7 @@ tabs.auxiliary_configuration.initialize = function(callback) {
                 AUX_val_buffer_out.push(lowByte(AUX_CONFIG_values[i] & 0xFFF));
                 AUX_val_buffer_out.push(highByte(AUX_CONFIG_values[i] & 0xFFF));
             }
-            if (bit_check(CONFIG.capability, 5)) {
+            if (bit_check(CONFIG.capability, 5) && (RC.active_channels - 4) > 4) {
                 for (var i = 0; i < AUX_CONFIG_values.length; i++) {
                     AUX_val_buffer_out.push(lowByte((AUX_CONFIG_values[i] >> 16) & 0xFFF));
                     AUX_val_buffer_out.push(highByte((AUX_CONFIG_values[i] >> 16) & 0xFFF));