Fix TC4.1.4, TC4.3.3