Fixed ray ordering and ExtendedMOP argument