Reorder a bit for sanity