bug fix and t_up