Repair bug with avatars.