added corrections to make 2 TCs working reliable