Fix ToF #1520