Fix issue related to streamWaitTimeout