Fix clear Timer
Logic fix for on-stop
Automatically rewritten for npm.