diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js
index e49dd0ab..10580bcd 100755
--- a/ui (gen4)/ribbons.js	
+++ b/ui (gen4)/ribbons.js	
@@ -1533,7 +1533,7 @@ module.RibbonsPrototype = {
 	//
 	// XXX might be usefull to set origin before scaling...
 	fitImage: function(n){
-		n = n == null ? 1 : n
+		n = n || 1
 
 		// NOTE: this is width oriented...
 		var scale = this.getScreenWidthImages(1) / n
@@ -1558,6 +1558,7 @@ module.RibbonsPrototype = {
 	// 		number of images in width...
 	// XXX this does not account for ribbon spacing...
 	fitRibbon: function(n, fit_whole_images){
+		n = n || 1
 		fit_whole_images = fit_whole_images == null ? true : false
 
 		var h = this.getVisibleImageSize('height', 1)
diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js
index d2f983b7..60a16f13 100755
--- a/ui (gen4)/viewer.js	
+++ b/ui (gen4)/viewer.js	
@@ -1355,7 +1355,7 @@ module.CurrentImageIndicator = Feature({
 			// 	- before animation when scaling up
 			// 	- after when scaling down
 			// This is done to make the visuals consistent...
-			.on( 'fitImage.pre', this.tag, function(w1){ 
+			.on( 'fitImage.pre fitRibbon.pre', this.tag, function(w1){ 
 				var w0 = this.screenwidth
 				w1 = w1 || 1
 				return function(){