Fix dependence on alphabetical ordering