Detect when to stop (more) properly