Fix for avatars