Fix handling visual mode
Merge branch 'fix/handle-visual'