Fix order of entries.