Fixed double click event