[TH JE] address ordering fix

Noma has confirmed this fixes the ordering issues, creating a PR and merging it.