Fix dict key ordering
Only the paradoxes are broken now