fixed defects TC-006 & TC-007