Fix double click issue