Update to start stop logic

fix bug on start stop logic