[CHANGE] better timeout check;