Fix duplicated and lost lines in heavy charge events