diff --git a/ChangeLog b/ChangeLog
index c15d3da8..771bf03a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,12 +13,9 @@
 
   * bug fix: if names given with the -o option were too long, the server registration failed (Ticket #91)
 
+  * bug fix: audio level changes if Buffer Delay is changed (Ticket #106)
 
 
-TODO the server list filter seems not to work if --showallservers is used
-
-TODO audio level changes if Buffer Delay is changed
-
 TODO improve audio drop out behaviour with OPUS64 by tuning the coding rate (it seems that for some coding rates we get loud artifacts
      on audio drop outs whereas for slightly different rates the behavior is much more pleasent)
 
diff --git a/src/channel.cpp b/src/channel.cpp
index a9778c76..de629a82 100755
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -390,6 +390,10 @@ void CChannel::OnNetTranspPropsReceived ( CNetworkTransportProps NetworkTranspor
                 iAudioFrameSizeSamples = SYSTEM_FRAME_SIZE_SAMPLES;
             }
 
+            // the fade-in counter maximum value may have changed, make sure the fade-in counter
+            // is not larger than the allowed maximum value
+            iFadeInCnt = std::min ( iFadeInCnt, iFadeInCntMax );
+
             MutexSocketBuf.lock();
             {
                 // update socket buffer (the network block size is a multiple of the
diff --git a/src/client.cpp b/src/client.cpp
index 4a7d1975..fee96619 100755
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1117,7 +1117,7 @@ void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd )
         else
         {
             // for lost packets use null pointer as coded input data
-            pCurCodedData   = nullptr;
+            pCurCodedData = nullptr;
 
             // invalidate the buffer OK status flag
             bJitterBufferOK = false;