diff --git a/libfreerdp/core/gateway/tsg.c b/libfreerdp/core/gateway/tsg.c
index f5cf7e430..873adf977 100644
--- a/libfreerdp/core/gateway/tsg.c
+++ b/libfreerdp/core/gateway/tsg.c
@@ -445,9 +445,9 @@ static BOOL tsg_ndr_read_string(wLog* log, wStream* s, WCHAR** str, UINT32 lengt
 	if (str)
 		*str = Stream_PointerAs(s, WCHAR);
 
-	if (!Stream_CheckAndLogRequiredLengthWLog(log, s, MaxCount))
+	if (!Stream_CheckAndLogRequiredLengthWLog(log, s, ActualCount * sizeof(WCHAR)))
 		return FALSE;
-	Stream_Seek(s, MaxCount);
+	Stream_Seek(s, ActualCount * sizeof(WCHAR));
 	return TRUE;
 }