Fixed up ordering for consistency