Fix issue with RayHandler