Update: refactoring, dictionaries are unpredictable.
Update: refactoring