bug fix for long click and double click