Fix TimeOut issue