potential fix for issues caused by timeout implementation