Fixed bug with empty avatars