fixed bug in double click
Merge commit 'c1a1d5e66ea1a83836a77f1a3505352067244324'