Fixed double click issue