Fixed problem with avatars