One more attempt at correcting issues with the TOF data