AUTO-611 double click bug