Added  option, fixed the stop task