More reordering for consistency