Fix harakiri issue in case of thundering herd. Fix #365