fixed dictionaries
merge fix