[FIX] Sort order