Merge TCO bug fix