Accessibility fix

Just duplication of pull request #421, but for this particular branch.