Fixed issue with double click