diff --git a/README.md b/README.md
index a3058af..3831e31 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,9 @@ Some of the future ideas to add to Devede NG are, without an specific order:
 
 
 ## History of versions ##
+* version 0.1 beta 4 (2014-12-25)
+  * Now ensures that the maximum bitrate is honored
+
 * version 0.1 beta 3 (2014-12-21)
   * Fixed the subtitle colors
   * Now puts the video and audio streams in the right order
diff --git a/src/devede/configuration_data.py b/src/devede/configuration_data.py
index bef51d8..f767995 100644
--- a/src/devede/configuration_data.py
+++ b/src/devede/configuration_data.py
@@ -35,7 +35,7 @@ class configuration(GObject.GObject):
 
     def __init__(self):
         GObject.GObject.__init__(self)
-        self.version = "0.1 Beta 3"
+        self.version = "0.1 Beta 4"
 
     def fill_config(self):
 
diff --git a/src/devede/project.py b/src/devede/project.py
index 1138824..ec2f037 100644
--- a/src/devede/project.py
+++ b/src/devede/project.py
@@ -327,8 +327,8 @@ class devede_project:
             min_bps = 300
             max_total = 2700
         else:
-            max_bps = -1
-            min_bps = -1
+            max_bps = 9000
+            min_bps = 300
             max_total = -1
 
         if (total_resolution != 0):
@@ -339,14 +339,16 @@ class devede_project:
                 length = l[2]
                 audio_rate = l[3]
                 video_rate = (remaining_disc_size * surface) / ( length * total_resolution)
-                if (max_total != -1):
+                if max_total != -1:
                     max2 = max_total - audio_rate
                     if (max2 > max_bps):
                         max2 = max_bps
-                    if (video_rate > max2):
-                        video_rate = max2
-                    if (video_rate < min_bps):
-                        video_rate = min_bps
+                else:
+                    max2 = max_bps
+                if (video_rate > max2):
+                    video_rate = max2
+                if (video_rate < min_bps):
+                    video_rate = min_bps
                 f.set_auto_video_audio_rate(video_rate, audio_rate)
 
         self.refresh_disc_usage()