Partial fix for the multi-hit TDC events - not complete