fixed avatars issue