Accessibility enhancement

This is just duplication of the request #423, but for this particular
branch.