Add some sort() to be more predictable