Fix another bug when stopping distribution