diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js
index ffe2dd5c..c770ef9a 100755
--- a/ui (gen4)/ribbons.js	
+++ b/ui (gen4)/ribbons.js	
@@ -752,7 +752,10 @@ module.RibbonsPrototype = {
 				.append(img)
 		// after...
 		} else if(i > 0){
-			to.next('.image')
+			// XXX this stumbles on non-images...
+			//to.next('.image')
+			// XXX is this fast enough??
+			to.nextAll('.image').first()
 				.before(img)
 		// before...
 		} else {
diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js
index 70f246f3..db532c18 100755
--- a/ui (gen4)/viewer.js	
+++ b/ui (gen4)/viewer.js	
@@ -1192,6 +1192,7 @@ module.BoundsIndicators = Feature({
 				function(target){ 
 					target = target || this.current
 					var r = this.data.getRibbonOrder(target)
+
 					var l = this.data.getImages(r).length
 					var l0 = this.data.getImages(0).length