Fix cross-context issue.