fix for TOF