bugfix on timeout handling