Broader quit detection