Fix TPB issue which would prevent TPB from working altogether