Updated code to Correct TC-0009