diff --git a/src/collision/Ray.js b/src/collision/Ray.js
index 4cbaf353b..d0a235108 100644
--- a/src/collision/Ray.js
+++ b/src/collision/Ray.js
@@ -109,6 +109,8 @@ Ray.prototype.intersectWorld = function (world, options) {
     this.skipBackfaces = !!options.skipBackfaces;
     this.collisionFilterMask = typeof(options.collisionFilterMask) !== 'undefined' ? options.collisionFilterMask : -1;
     this.collisionFilterGroup = typeof(options.collisionFilterGroup) !== 'undefined' ? options.collisionFilterGroup : -1;
+    this.checkCollisionResponse = typeof(options.checkCollisionResponse) !== 'undefined' ? options.checkCollisionResponse : true;
+    
     if(options.from){
         this.from.copy(options.from);
     }
diff --git a/src/objects/Body.js b/src/objects/Body.js
index 671905db3..6f2bf75ec 100644
--- a/src/objects/Body.js
+++ b/src/objects/Body.js
@@ -664,7 +664,7 @@ Body.prototype.computeAABB = function(){
         offset.vadd(this.position, offset);
 
         // Get shape world quaternion
-        shapeOrientations[i].mult(bodyQuat, orientation);
+        bodyQuat.mult(shapeOrientations[i], orientation);
 
         // Get shape AABB
         shape.calculateWorldAABB(offset, orientation, shapeAABB.lowerBound, shapeAABB.upperBound);