Disruption: fix some bugs on the whole at chain