[#160] Accessibility fix