fix issue with double tap at current point.

Merge