slightly better fix for avatars