Repair broken force_stop functionality