Fix reordering due to removal of Other