fix timeout issue, added limit