[use] Fix reordering

Fixes #1235.
4 files changed