New version with fix for fast double click