; (B) in clause (ii)— (i) by inserting for months beginning before the date of the enactment of the Social Security Administration Fairness Act , before the first month ; and (ii) by striking terminated, and inserting , or ; and (C) by adding at the end the following new clause: (iii) for months beginning on or after the date of the enactment of the Social Security Administration Fairness Act , the first month during all of which he is under a disability and in which he becomes entitled to such insurance benefits, . 4. Eliminating the 24-month waiting period for Medicare coverage for individuals with disabilities (a) In general Section 226(b) of the Social Security Act ( 42 U.S.C. 426(b) ) is amended— (1) in paragraph (2)(A), by striking , and has for 24 calendar months been entitled to, ; (2) in paragraph (2)(B), by striking , and has been for not less than 24 months, ; (3) in paragraph (2)(C)(ii), by striking , including the requirement that he has been entitled to the specified benefits for 24 months, ; (4) in the first sentence, by striking for each month beginning with the later of (I) July 1973 or (II) the twenty-fifth month of his entitlement or status as a qualified railroad retirement beneficiary described in paragraph (2), and and inserting for each month for which the individual meets the requirements of paragraph (2), beginning with the month following the month in which the individual meets the requirements of such paragraph, and ; and (5) in the second sentence, by striking the twenty-fifth month of his entitlement and all that follows through paragraph (2)(C) and . (b) Conforming amendments (1) Section 226 Section 226 of the Social Security Act ( 42 U.S.C. 426 ) is amended by— (A) striking subsections (e)(1)(B), (f), and (h)