Additional accessibility fix