Bugfix in TOF