Fixing "unassigned"