@@ -3355,10 +3355,11 @@
 static cackey_ret cackey_token_present(struct cackey_slot *slot) {
 	cackey_ret pcsc_connect_ret;
 	DWORD reader_len = 0, state = 0, protocol = 0, atr_len;
 	BYTE atr[MAX_ATR_SIZE];
 	LONG status_ret, scard_reconn_ret;
+	LPSTR *reader_name;
 
 	CACKEY_DEBUG_PRINTF("Called.");
 
 	if (slot->internal) {
 		CACKEY_DEBUG_PRINTF("Returning token present (internal token)");
@@ -3375,10 +3376,23 @@
 
 	CACKEY_DEBUG_PRINTF("Calling SCardStatus() to determine card status");
 
 	atr_len = sizeof(atr);
 	status_ret = SCardStatus(slot->pcsc_card, NULL, &reader_len, &state, &protocol, atr, &atr_len);
+ 
+	if (status_ret == SCARD_E_INSUFFICIENT_BUFFER) {
+		CACKEY_DEBUG_PRINTF("ScardStatus() returned SCARD_E_INSUFFICIENT_BUFFER, assuming this is a bug (e.g., Google PCSC) implementation and retrying");
+
+		atr_len = sizeof(atr);
+
+		reader_len = 32768;
+		reader_name = malloc(reader_len);
+
+		status_ret = SCardStatus(slot->pcsc_card, reader_name, &reader_len, &state, &protocol, atr, &atr_len);
+
+		free(reader_name);
+	}
 
 	if (status_ret == SCARD_E_INVALID_HANDLE) {
 		CACKEY_DEBUG_PRINTF("SCardStatus() returned SCARD_E_INVALID_HANDLE, marking as not already connected and trying again");
 		cackey_mark_slot_reset(slot);