Improve doubleclicking