diff --git a/src/Config.h b/src/Config.h
index 406f0efc..75b8068c 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO					4
 #define VER_LAMEXP_TYPE						Alpha
 #define VER_LAMEXP_PATCH					2
-#define VER_LAMEXP_BUILD					1860
+#define VER_LAMEXP_BUILD					1861
 #define VER_LAMEXP_CONFG					1818
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Encoder_Abstract.cpp b/src/Encoder_Abstract.cpp
index 5ba30491..47947de3 100644
--- a/src/Encoder_Abstract.cpp
+++ b/src/Encoder_Abstract.cpp
@@ -40,6 +40,7 @@ AbstractEncoder::~AbstractEncoder(void)
 {
 }
 
+
 /*
  * Setters
  */
@@ -51,6 +52,7 @@ void AbstractEncoder::setRCMode(const int &mode)
 		MUTILS_THROW("This RC mode is not supported by the encoder!");
 	}
 	m_configRCMode = qMax(0, mode);
+	m_configBitrate = qBound(0, m_configBitrate, toEncoderInfo()->valueCount(m_configRCMode) - 1);
 }
 
 void AbstractEncoder::setBitrate(const int &bitrate)