fix the stop bug