Logic fix for on-stop