Patch for BallJoint and FreeJoint bug - part 2