Fix no-avatar case