Fix exiting bug in watch