timeout is changed from None to 60 comparing to previous version