diff --git a/core/test/bwcheck-smil.html b/core/test/bwcheck-smil.html
index 1be98c7..150f24e 100644
--- a/core/test/bwcheck-smil.html
+++ b/core/test/bwcheck-smil.html
@@ -9,7 +9,7 @@
 		Flash embedding and provides the Flowplayer API.
 	-->
     <!--<script type="text/javascript" src="flowplayer-3.0.5.min.js"></script>-->
-    <script src="../flowplayer-3.2.6.min.js"></script>
+    <script src="../src/javascript/flowplayer.js/flowplayer-3.2.11.min.js"></script>
 
 	<!-- some minimal styling, can be removed -->
 	<!--<link rel="stylesheet" type="text/css" href="style.css">-->
@@ -28,74 +28,44 @@
 
 		<!-- this will install flowplayer inside previous A- tag. -->
 <script>
-    flowplayer("player", "../build/flowplayer.swf",
+    flowplayer("player", "http://flash.cdn.201f.flowplayer.me.s3.amazonaws.com/swf/flowplayer-3.2.19-dev.swf",
     {
-        log: { level: 'debug', filter: 'org.flowplayer.bwcheck.*' },
+        log: { level: 'debug', filter: 'org.flowplayer.controls.scrubber.ScrubberSlider' },
 
-
-        // The playlist is loaded from the RSS file
+        debug: true,
         clip: {
-            url: "bitrates.smil.xml",
+            provider: "rtmp",
+            scaling: "fit",
             autoPlay: false,
-            provider: 'rtmp',
-
-            // use smil and bwcheck when resolving the clip URL
-            urlResolvers: [ 'smil', 'bwcheck' ]
+            urlResolvers: ["smil", "bwcheck"],
+            url: "http://flowplayer.blacktrash.org/test/live-smil.smil"
         },
-
         plugins: {
-
-            // the SMIL plugin reads in and parses the SMIL, and provides
-            // the bitrates info to the bw detection plugin
-            smil: {
-                url: 'flowplayer.smil.swf'
+            controls: {autoHide: false},
+//            content: {url: "flowplayer.content.swf", height: 100},
+            smil: {url: "flowplayer.smil-3.2.9.swf"},
+            rtmp: {
+                url: "flowplayer.rtmp-3.2.13.swf",
+                netConnectionUrl: "rtmp://50.7.180.18/vod"
             },
-
-            // bandwidth check plugin
             bwcheck: {
-                url: 'flowplayer.bwcheck.swf',
-
-                // HDDN uses Wowza servers
-                serverType: 'wowza',
-
-                // we use dynamic switching, the appropriate bitrate is switched on the fly
+                url: "flowplayer.bwcheck-3.2.13.swf",
+                netConnectionUrl: "rtmp://50.7.180.18/vod",
+                serverType: "wowza",
                 dynamic: true,
+                //dynamicBuffer: true,
+                //qos: {waitDurationAfterDownSwitch: 1000},
 
-                hdIcon: true,
-
-//                  netConnectionUrl: 'rtmp://vod01.netdna.com/play',
-
-                // show the selected file in the content box. This is not used in real installations.
-                onStreamSwitchBegin: function (newItem, currentItem) {
-                   $f().getPlugin('content').setHtml("Will switch to: " + newItem.streamName +
-                    " from " + currentItem.streamName);
+/*                onStreamSwitchBegin: function (newItem, currentItem) {
+                    this.getPlayer().getPlugin("content").setHtml("will switch from: " + currentItem.streamName + "<br />to: " + newItem.streamName);
                 },
                 onStreamSwitch: function (newItem) {
-                   $f().getPlugin('content').setHtml("Switched to: " + newItem.streamName);
-                }
-            },
-
-            // RTMP streaming plugin
-            rtmp: {
-                url: 'flowplayer.rtmp.swf',
-                netConnectionUrl: 'rtmp://vod01.netdna.com/play'
-            },
+                    this.getPlayer().getPlugin("content").setHtml("switched to: " + newItem.streamName);
+                },
+                onStreamSwitchFailed: function (info) {
+                    this.getPlayer().getPlugin("content").setHtml(info);
 
-            // a content box so that we can see the selected bitrate. This is not normally
-            // used in real installations.
-            content: {
-                url: 'flowplayer.content.swf',
-                top: 0, left: 0, width: 400, height: 150,
-                backgroundColor: 'transparent', backgroundGradient: 'none', border: 0,
-                textDecoration: 'outline',
-                style: {
-                    body: {
-                        fontSize: 14,
-                        fontFamily: 'Arial',
-                        textAlign: 'center',
-                        color: '#ffffff'
-                    }
-                }
+                }*/
             }
         }
     });
diff --git a/core/test/jscontrols.html b/core/test/jscontrols.html
index eabaccf..bd255a6 100644
--- a/core/test/jscontrols.html
+++ b/core/test/jscontrols.html
@@ -1,8 +1,8 @@
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <!--<script type="text/javascript" src="flowplayer-3.0.5.min.js"></script>-->
-    <script src="../flowplayer-3.2.6.min.js"></script>
-    <script src="../../jsplugins/controls/trunk/flowplayer.controls.js"></script>
+    <script src="../../../flash-build/dist/flowplayer-3.2.13.min.js"></script>
+    <script src="../../../flash-build/dist/flowplayer.controls-3.2.11.min.js"></script>
 
 
 	<!-- page title -->
@@ -143,7 +143,7 @@
 <div id="controls" class="hulu"></div>
 
 <script>
-    flowplayer("player", "../build/flowplayer.swf",
+    flowplayer("player", "../../../flash-build/build/flowplayer-3.2.18.swf",
     {
         log: { level: 'debug', filter: 'org.flowplayer.bwcheck.*' },
 
diff --git a/core/test/simple.html b/core/test/simple.html
index 5a5680e..d718f87 100644
--- a/core/test/simple.html
+++ b/core/test/simple.html
@@ -18,7 +18,7 @@
                      id="player">
                 </a>
 <script>
-    flowplayer("player", "../../../flash-build/build/flowplayer-3.2.17-dev.swf",
+    flowplayer("player", "../../../flash-build/build/flowplayer-3.2.18.swf",
     {
         log: { level: 'debug', filter: 'org.flowplayer.controls.scrubber.ScrubberSlider'},
 
diff --git a/plugins/controls/README.txt b/plugins/controls/README.txt
index 90837b3..9d8d47d 100644
--- a/plugins/controls/README.txt
+++ b/plugins/controls/README.txt
@@ -1,5 +1,9 @@
 Version history:
 
+3.2.17
+------
+- #191 fix for buffer bar flickering problem with RTMP
+
 3.2.16 (Nov 2013)
 -----------------
 - #58 fix alignment issue with tooltips. first obtain the global coordinates of the parent to use for configuring the
diff --git a/plugins/controls/build.properties b/plugins/controls/build.properties
index fa65725..6ef665a 100644
--- a/plugins/controls/build.properties
+++ b/plugins/controls/build.properties
@@ -1,2 +1,2 @@
-version=3.2.16
+version=3.2.17-dev
 devkit-dir=../../lib/devkit
diff --git a/plugins/controls/src/actionscript/org/flowplayer/controls/scrubber/ScrubberController.as b/plugins/controls/src/actionscript/org/flowplayer/controls/scrubber/ScrubberController.as
index 79149dc..11903ee 100644
--- a/plugins/controls/src/actionscript/org/flowplayer/controls/scrubber/ScrubberController.as
+++ b/plugins/controls/src/actionscript/org/flowplayer/controls/scrubber/ScrubberController.as
@@ -9,142 +9,142 @@
  */
 package org.flowplayer.controls.scrubber {
 
-    import flash.events.Event;
-    import flash.events.TimerEvent;
-
-    import org.flowplayer.controls.SkinClasses;
-    import org.flowplayer.controls.controllers.AbstractTimedWidgetController;
-    import org.flowplayer.model.Clip;
-    import org.flowplayer.model.ClipEvent;
-    import org.flowplayer.model.Status;
-    import org.flowplayer.ui.buttons.WidgetDecorator;
-    import org.flowplayer.util.TimeUtil;
-
-    public class ScrubberController extends AbstractTimedWidgetController {
-        private var _enableOnStart:Boolean;
-
-		public function ScrubberController() {
-			super();
-		}
-	
-		override public function get name():String {
-			return "scrubber";
-		}
-	
-		override public function get defaults():Object {
-			return {
-				tooltipEnabled: true,
-				visible: true,
-				enabled: true
-			};
-		}
-	
-		override protected function createWidget():void {
-			log.debug("Creating scrubber with ", _config)
-			_widget = new ScrubberSlider(_config as ScrubberConfig, _player, _controlbar);
-            //#443 disabling tabbing for accessibility options
-            setInaccessible(_widget);
+import flash.events.Event;
+import flash.events.TimerEvent;
+
+import org.flowplayer.controls.SkinClasses;
+import org.flowplayer.controls.controllers.AbstractTimedWidgetController;
+import org.flowplayer.model.Clip;
+import org.flowplayer.model.ClipEvent;
+import org.flowplayer.model.Status;
+import org.flowplayer.ui.buttons.WidgetDecorator;
+import org.flowplayer.util.TimeUtil;
+
+public class ScrubberController extends AbstractTimedWidgetController {
+   private var _enableOnStart:Boolean;
+
+   public function ScrubberController() {
+      super();
+   }
+
+   override public function get name():String {
+      return "scrubber";
+   }
+
+   override public function get defaults():Object {
+      return {
+         tooltipEnabled: true,
+         visible: true,
+         enabled: true
+      };
+   }
+
+   override protected function createWidget():void {
+      log.debug("Creating scrubber with ", _config)
+      _widget = new ScrubberSlider(_config as ScrubberConfig, _player, _controlbar);
+      //#443 disabling tabbing for accessibility options
+      setInaccessible(_widget);
 //            enableScrubber(true);
-        }
-
-		override protected function createDecorator():void {
-			_decoratedView = new WidgetDecorator(SkinClasses.getDisplayObject("fp.ScrubberTopEdge"),
-										 	 	 SkinClasses.getDisplayObject("fp.ScrubberRightEdge"),
-												 SkinClasses.getDisplayObject("fp.ScrubberBottomEdge"),
-												 SkinClasses.getDisplayObject("fp.ScrubberLeftEdge"), true).init(_widget);
-		}
-
-		override protected function onTimeUpdate(event:TimerEvent):void {
-            var status:Status = getPlayerStatus();
-            if (! status) return;
-
-            var duration:Number = status.clip ? status.clip.duration : 0;
-			var scrubber:ScrubberSlider = (_widget as ScrubberSlider);
-			if (duration > 0) {
-				scrubber.value = (status.time / duration) * 100;
-				scrubber.setBufferRange(status.bufferStart / duration, status.bufferEnd / duration);
-				scrubber.allowRandomSeek = status.allowRandomSeek;
-			} else {
-				scrubber.value = 0;
-				scrubber.setBufferRange(0, 0);
-				scrubber.allowRandomSeek = false;
-			}
-			if (status.clip) {
-				scrubber.tooltipTextFunc = function(percentage:Number):String {
-					if (duration == 0) return null;
-					if (percentage < 0) {
-						percentage = 0;
-					}
-					if (percentage > 100) {
-						percentage = 100;
-					}
-					return TimeUtil.formatSeconds(percentage / 100 * duration);
-				};
-			}
-        }
-
-		override protected function onPlayStarted(event:ClipEvent):void {
-			super.onPlayStarted(event);
-            log.info("received " + event + ", time " + _player.status.time);
-			if (_player.status.time < 0.5) {
-                if (_enableOnStart) {
-                    enableScrubber(true);
-                    _enableOnStart = false;
-                }
-			}
-		}
-
-		
-		override protected function onPlayPaused(event:ClipEvent):void {
-			super.onPlayPaused(event);
-            log.info("received " + event + ", time " + _player.status.time);
-			var clip:Clip = event.target as Clip;
-			log.info("clip.seekableOnBegin: " + clip.seekableOnBegin);
-			if (_player.status.time == 0 && ! clip.seekableOnBegin) {
-                if (_widget.enabled) {
-                    enableScrubber(false);
-                    _enableOnStart = true;
-                }
+   }
+
+   override protected function createDecorator():void {
+      _decoratedView = new WidgetDecorator(SkinClasses.getDisplayObject("fp.ScrubberTopEdge"),
+              SkinClasses.getDisplayObject("fp.ScrubberRightEdge"),
+              SkinClasses.getDisplayObject("fp.ScrubberBottomEdge"),
+              SkinClasses.getDisplayObject("fp.ScrubberLeftEdge"), true).init(_widget);
+   }
+
+   override protected function onTimeUpdate(event:TimerEvent):void {
+      var status:Status = getPlayerStatus();
+      if (!status) return;
+
+      var duration:Number = status.clip ? status.clip.duration : 0;
+      var scrubber:ScrubberSlider = (_widget as ScrubberSlider);
+      if (duration > 0) {
+         scrubber.value = (status.time / duration) * 100;
+         scrubber.setBufferRange(status.bufferStart / duration, status.bufferEnd / duration);
+         scrubber.allowRandomSeek = status.allowRandomSeek;
+      } else {
+         scrubber.value = 0;
+         scrubber.setBufferRange(0, 0);
+         scrubber.allowRandomSeek = false;
+      }
+      if (status.clip) {
+         scrubber.tooltipTextFunc = function (percentage:Number):String {
+            if (duration == 0) return null;
+            if (percentage < 0) {
+               percentage = 0;
             }
-        }
-
-        override protected function onPlayResumed(event:ClipEvent):void {
-			super.onPlayResumed(event);
-
-            //#42 when returning and resuming from an instream clip, restart the time update timer.
-            if (!_timeUpdateTimer.running) _timeUpdateTimer.start();
-
-            log.info("received " + event + ", time " + _player.status.time);
-			if (_player.status.time < 0.5) {
-                if (_enableOnStart) {
-                    enableScrubber(true);
-                    _enableOnStart = false;
-                }
-			}
-        }
-
-		private function enableScrubber(enabled:Boolean):void {
-            log.debug("enableScrubber() setting scrubber enabled " + enabled);
-            if (!_widget) return;
-
-			_widget.enabled = enabled;
-
-		//	log.error("Enabling scrubber :", enabled);
-
-			if (enabled) {
-				_widget.addEventListener(ScrubberSlider.DRAG_EVENT, onScrubbed);
-			} else {
-				_widget.removeEventListener(ScrubberSlider.DRAG_EVENT, onScrubbed);
-			}
-		}
-		
-
-		private function onScrubbed(event:Event):void {
-            log.debug("onScrubbed() " + ScrubberSlider(event.target).value);
-			_player.seekRelative(ScrubberSlider(event.target).value);
-		}
+            if (percentage > 100) {
+               percentage = 100;
+            }
+            return TimeUtil.formatSeconds(percentage / 100 * duration);
+         };
+      }
+   }
+
+   override protected function onPlayStarted(event:ClipEvent):void {
+      super.onPlayStarted(event);
+      log.info("received " + event + ", time " + _player.status.time);
+      if (_player.status.time < 0.5) {
+         if (_enableOnStart) {
+            enableScrubber(true);
+            _enableOnStart = false;
+         }
+      }
+   }
+
+
+   override protected function onPlayPaused(event:ClipEvent):void {
+      super.onPlayPaused(event);
+      log.info("received " + event + ", time " + _player.status.time);
+      var clip:Clip = event.target as Clip;
+      log.info("clip.seekableOnBegin: " + clip.seekableOnBegin);
+      if (_player.status.time == 0 && !clip.seekableOnBegin) {
+         if (_widget.enabled) {
+            enableScrubber(false);
+            _enableOnStart = true;
+         }
+      }
+   }
+
+   override protected function onPlayResumed(event:ClipEvent):void {
+      super.onPlayResumed(event);
+
+      //#42 when returning and resuming from an instream clip, restart the time update timer.
+      if (!_timeUpdateTimer.running) _timeUpdateTimer.start();
+
+      log.info("received " + event + ", time " + _player.status.time);
+      if (_player.status.time < 0.5) {
+         if (_enableOnStart) {
+            enableScrubber(true);
+            _enableOnStart = false;
+         }
+      }
+   }
+
+   private function enableScrubber(enabled:Boolean):void {
+      log.debug("enableScrubber() setting scrubber enabled " + enabled);
+      if (!_widget) return;
+
+      _widget.enabled = enabled;
+
+      //	log.error("Enabling scrubber :", enabled);
+
+      if (enabled) {
+         _widget.addEventListener(ScrubberSlider.DRAG_EVENT, onScrubbed);
+      } else {
+         _widget.removeEventListener(ScrubberSlider.DRAG_EVENT, onScrubbed);
+      }
+   }
+
+
+   private function onScrubbed(event:Event):void {
+      log.debug("onScrubbed() " + ScrubberSlider(event.target).value);
+      _player.seekRelative(ScrubberSlider(event.target).value);
+   }
 
 
-	}
+}
 }
 
diff --git a/plugins/controls/src/actionscript/org/flowplayer/controls/scrubber/ScrubberSlider.as b/plugins/controls/src/actionscript/org/flowplayer/controls/scrubber/ScrubberSlider.as
index 056b6b0..fa8cb00 100644
--- a/plugins/controls/src/actionscript/org/flowplayer/controls/scrubber/ScrubberSlider.as
+++ b/plugins/controls/src/actionscript/org/flowplayer/controls/scrubber/ScrubberSlider.as
@@ -460,11 +460,8 @@ package org.flowplayer.controls.scrubber {
        }
 
        private function drawBufferBar():void {
-          if (_dragger.x + _dragger.width / 2 > _bufferStart * width) {
-             doDrawBufferBar(_bufferStart * width, _bufferEnd * width);
-          } else {
-             clearBar(_bufferBar);
-          }
+          log.debug("dragger pos " + _dragger.x + ", buffer start " + _bufferStart + ", end " + _bufferEnd);
+          doDrawBufferBar(Math.min(_dragger.x + _dragger.width / 2, _bufferStart * width), _bufferEnd * width);
        }
 
        private function clearBar(bar:Sprite):void {