Patch to wait at most timeout/2