Don't rely on dictionary order - fixes 123

Fixes #123.