add extra wait for stream options