diff --git a/include/freerdp/update.h b/include/freerdp/update.h
index 7a1bf1457..bb263754b 100644
--- a/include/freerdp/update.h
+++ b/include/freerdp/update.h
@@ -21,7 +21,6 @@
 #define __UPDATE_API_H
 
 #include <freerdp/types.h>
-#include <freerdp/utils/stream.h>
 
 /* Common */
 
@@ -805,7 +804,7 @@ struct _SURFACE_BITS_COMMAND
 	uint16 width;
 	uint16 height;
 	uint32 bitmapDataLength;
-	STREAM* bitmapData;
+	uint8* bitmapData;
 };
 typedef struct _SURFACE_BITS_COMMAND SURFACE_BITS_COMMAND;
 
diff --git a/libfreerdp-core/fastpath.c b/libfreerdp-core/fastpath.c
index 674ca065b..da8df33a0 100644
--- a/libfreerdp-core/fastpath.c
+++ b/libfreerdp-core/fastpath.c
@@ -81,7 +81,7 @@ static int fastpath_recv_update_surfcmd_surface_bits(rdpFastPath* fastpath, STRE
 	stream_read_uint16(s, cmd->height);
 	stream_read_uint32(s, cmd->bitmapDataLength);
 	pos = stream_get_pos(s) + cmd->bitmapDataLength;
-	cmd->bitmapData = s;
+	cmd->bitmapData = stream_get_tail(s);
 
 	IFCALL(update->SurfaceBits, update, cmd);