diff --git a/channels/rdpecam/server/camera_device_enumerator_main.c b/channels/rdpecam/server/camera_device_enumerator_main.c
index 7657a3050..a17eeee93 100644
--- a/channels/rdpecam/server/camera_device_enumerator_main.c
+++ b/channels/rdpecam/server/camera_device_enumerator_main.c
@@ -298,10 +298,10 @@ static UINT enumerator_process_message(enumerator_server* enumerator)
 		goto out;
 	}
 
+	Stream_SetLength(s, BytesReturned);
 	if (!Stream_CheckAndLogRequiredLength(TAG, s, CAM_HEADER_SIZE))
 		return ERROR_NO_DATA;
 
-	Stream_SetLength(s, BytesReturned);
 	Stream_Read_UINT8(s, header.Version);
 	Stream_Read_UINT8(s, header.MessageId);
 
diff --git a/channels/rdpecam/server/camera_device_main.c b/channels/rdpecam/server/camera_device_main.c
index c675beb55..00bea941e 100644
--- a/channels/rdpecam/server/camera_device_main.c
+++ b/channels/rdpecam/server/camera_device_main.c
@@ -438,7 +438,7 @@ static UINT device_process_message(device_server* device)
 		goto out;
 	}
 
-	Stream_Seek(s, BytesReturned);
+	Stream_SetLength(s, BytesReturned);
 	if (!Stream_CheckAndLogRequiredLength(TAG, s, CAM_HEADER_SIZE))
 		return ERROR_NO_DATA;
 
diff --git a/channels/telemetry/server/telemetry_main.c b/channels/telemetry/server/telemetry_main.c
index 3f8b3d12d..717360311 100644
--- a/channels/telemetry/server/telemetry_main.c
+++ b/channels/telemetry/server/telemetry_main.c
@@ -185,7 +185,7 @@ static UINT telemetry_process_message(telemetry_server* telemetry)
 		goto out;
 	}
 
-	Stream_Seek(s, BytesReturned);
+	Stream_SetLength(s, BytesReturned);
 	if (!Stream_CheckAndLogRequiredLength(TAG, s, 2))
 		return ERROR_NO_DATA;
 
diff --git a/include/freerdp/channels/rdpecam.h b/include/freerdp/channels/rdpecam.h
index ee06bcd20..2d5ae4008 100644
--- a/include/freerdp/channels/rdpecam.h
+++ b/include/freerdp/channels/rdpecam.h
@@ -1,9 +1,8 @@
 /**
  * FreeRDP: A Remote Desktop Protocol Implementation
- * Video Optimized Remoting Virtual Channel Extension
+ * Video Capture Virtual Channel Extension
  *
- * Copyright 2021 Armin Novak <armin.novak@thincast.com>
- * Copyright 2021 Thincast Technologies GmbH
+ * Copyright 2022 Pascal Nowack <Pascal.Nowack@gmx.de>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.