remove_avatar fix