Fixing dict creation