fixed TC-026