Fix how dictionaries are handled