Changed lookup to include the subject's origin.