Fixed default ordering