bug fix from Dilson and Tof 30s