diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8ece9372..db938372 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 lib_xua Change Log
 ==================
 
+3.5.1
+-----
+
+  * FIXED:     Respect I2S_CHANS_PER_FRAME when calculating bit-clock rates
+
 3.5.0
 -----
 
diff --git a/lib_xua/module_build_info b/lib_xua/module_build_info
index 3e24d952..c327e5c2 100644
--- a/lib_xua/module_build_info
+++ b/lib_xua/module_build_info
@@ -1,4 +1,4 @@
-VERSION = 3.5.0
+VERSION = 3.5.1
 
 DEBUG ?= 0
 
diff --git a/lib_xua/src/core/audiohub/xua_audiohub.xc b/lib_xua/src/core/audiohub/xua_audiohub.xc
index 08ad7517..953c3ee6 100755
--- a/lib_xua/src/core/audiohub/xua_audiohub.xc
+++ b/lib_xua/src/core/audiohub/xua_audiohub.xc
@@ -715,13 +715,7 @@ void XUA_AudioHub(chanend ?c_aud, clock ?clk_audio_mclk, clock ?clk_audio_bclk,
         /* Calculate master clock to bit clock (or DSD clock) divide for current sample freq
          * e.g. 11.289600 / (176400 * 64)  = 1 */
         {
-            unsigned numBits = XUA_I2S_N_BITS * 2;
-
-            if(XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM)
-            {
-                /* TDM has 8 channels */
-                numBits *= 4;
-            }
+            unsigned numBits = XUA_I2S_N_BITS * I2S_CHANS_PER_FRAME;
 
 #if (DSD_CHANS_DAC > 0)
             if(dsdMode == DSD_MODE_DOP)