fix for avatar assumption