Fixing accessibility bug