Disruption: fix some bugs on the whole at chain

Why don't you use 2?