fixed TC-024