Fix inconsistent order