Fix to fix of raptor