Fix up ordering