Fixed inconsistent ordering