Improve click capture detection