Improve stop procedure.
Minor fix.