Closing window reentrance fix