Fixing dict entities