diff --git a/kernels/common/rtcore.cpp b/kernels/common/rtcore.cpp
index cca8c33b15..d4767aa5f0 100644
--- a/kernels/common/rtcore.cpp
+++ b/kernels/common/rtcore.cpp
@@ -1017,12 +1017,12 @@ RTC_NAMESPACE_BEGIN;
        scene->intersectors.occluded4(valid,*ray,&context);
 
     else {
-      RayHit4* ray4 = (RayHit4*) ray;
+      Ray4* ray4 = (Ray4*) ray;
       for (size_t i=0; i<4; i++) {
         if (!valid[i]) continue;
-        RayHit ray1; ray4->get(i,ray1);
+        Ray ray1; ray4->get(i,ray1);
         scene->intersectors.occluded((RTCRay&)ray1,&context);
-        ray4->geomID[i] = ray1.geomID; 
+        ray4->set(i,ray1);
       }
     }
     
@@ -1123,10 +1123,10 @@ RTC_NAMESPACE_BEGIN;
       scene->intersectors.occluded8(valid,*ray,&context);
 
     else {
-      RayHit8* ray8 = (RayHit8*) ray;
+      Ray8* ray8 = (Ray8*) ray;
       for (size_t i=0; i<8; i++) {
         if (!valid[i]) continue;
-        RayHit ray1; ray8->get(i,ray1);
+        Ray ray1; ray8->get(i,ray1);
         scene->intersectors.occluded((RTCRay&)ray1,&context);
         ray8->set(i,ray1);
       }
@@ -1183,10 +1183,10 @@ RTC_NAMESPACE_BEGIN;
       scene->intersectors.occluded16(valid,*ray,&context);
 
     else {
-      RayHit16* ray16 = (RayHit16*) ray;
+      Ray16* ray16 = (Ray16*) ray;
       for (size_t i=0; i<16; i++) {
         if (!valid[i]) continue;
-        RayHit ray1; ray16->get(i,ray1);
+        Ray ray1; ray16->get(i,ray1);
         scene->intersectors.occluded((RTCRay&)ray1,&context);
         ray16->set(i,ray1);
       }