Fix batch building issue for TVClient.