Tori bug fixed