Fixing a defect for embededdentity