Fixed double click bug