fixed the tb issues