Fix bug with avatars