Really fix the situation where there's no sentinel group