Improve handling of muli-clicking edge cases