Fixing a bug with avatars