fixed timeout handling