adjust timeout handling