some issues with double-click algoritm have been solved.