Fixed timeout bug caused by changing times