fixed regression regarding avatars