@@ -751,6 +751,7 @@
 	subclass(group, box)
 	group.prototype.__hasPosAtCenter = true
 	group.prototype.__objects = []
+	group.prototype.__size
 	property.declare( group.prototype, {
 		objects: {
 			get: function() { return this.__objects },
@@ -793,7 +794,7 @@
 		axis_changed: function(oldaxis, newaxis){ // called from vectors.js
 				let ax = cross(oldaxis, newaxis)
 				let ang = diff_angle(oldaxis, newaxis)
-				this.rotate({angle:ang, axis:ax})
+				this.rotate({angle:ang, axis:ax, oldaxis:oldaxis, newaxis:newaxis})
 		},
 		rotate: function(args) {
 			let ang = args.angle
@@ -805,10 +806,17 @@
 			for (let c=0; c<this.__objects.length; c++) {
 				let obj = this.__objects[c]
 				obj.pos = this.group_to_world(obj.__pos)
-				obj.rotate({angle:ang, axis:ax, origin:org})
+				obj.rotate({angle:ang, axis:ax, origin:org}) // call regular rotate function
 				obj.pos = this.world_to_group(obj.__pos)
 				obj.__change()
 			}
+			if (args.oldaxis === undefined) { // rotate not called from axis_changed
+				let v = rotate(this.__axis, {angle:ang, axis:ax})
+				this.__axis = v
+				v = rotate(this.__up, {angle:ang, axis:ax})
+				this.__up = v
+			}
+
 		},
 		group_to_world: function(v) {
 			return v.add(this.__pos)
 
@@ -15,10 +15,6 @@
 
     function adjust_up(parent, oldaxis, newaxis) { // adjust up when axis is changed
     	parent.__change()
-        if (typeof group !== 'undefined' && parent instanceof group) {
-            parent.axis_changed(oldaxis, newaxis)
-            return
-        }
     	if (newaxis.mag2 === 0) {
     		// If axis has changed to <0,0,0>, must save the old axis to restore later
     		if (parent.__oldaxis === undefined) parent.__oldaxis = oldaxis
@@ -44,6 +40,9 @@
         	parent.__up.__y = newup.y
         	parent.__up.__z = newup.z
 	    }
+        if (typeof group !== 'undefined' && parent instanceof group) {
+            parent.axis_changed(oldaxis, newaxis)
+        }
     }
 
     function adjust_axis(parent, oldup, newup) { // adjust axis when up is changed
@@ -788,4 +787,4 @@
         __array_times_number: __array_times_number
     }
     Export(exports)
-})();
+})();