Fixed bug with avatars