tp6-part1 bug fix