TPB bugg fix