This fix is fine. wish MR1 (not sure exactly what it means) should have done a better job.