diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c
index 65262267..c875afcf 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c
@@ -68,15 +68,14 @@ void guac_rdpdr_fs_process_query_basic_info(guac_rdpdr_device* device, wStream*
     Stream_Write_UINT32(output_stream, completion_id);
     Stream_Write_UINT32(output_stream, STATUS_SUCCESS);
 
-    Stream_Write_UINT32(output_stream, 18 + GUAC_FILESYSTEM_NAME_LENGTH);
+    Stream_Write_UINT32(output_stream, 36);
     Stream_Write_UINT64(output_stream, file->ctime);      /* CreationTime   */
     Stream_Write_UINT64(output_stream, file->atime);      /* LastAccessTime */
     Stream_Write_UINT64(output_stream, file->mtime);      /* LastWriteTime  */
     Stream_Write_UINT64(output_stream, file->mtime);      /* ChangeTime     */
     Stream_Write_UINT32(output_stream, file->attributes); /* FileAttributes */
 
-    /* Reserved */
-    Stream_Write_UINT32(output_stream, 0);
+    /* Reserved field must not be sent */
 
     svc_plugin_send((rdpSvcPlugin*) device->rdpdr, output_stream);
 
diff --git a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c
index 52cc88a8..f0c44a02 100644
--- a/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c
+++ b/src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c
@@ -67,12 +67,12 @@ void guac_rdpdr_fs_process_query_volume_info(guac_rdpdr_device* device, wStream*
     Stream_Write_UINT32(output_stream, completion_id);
     Stream_Write_UINT32(output_stream, STATUS_SUCCESS);
 
-    Stream_Write_UINT32(output_stream, 18 + GUAC_FILESYSTEM_NAME_LENGTH);
+    Stream_Write_UINT32(output_stream, 17 + GUAC_FILESYSTEM_NAME_LENGTH);
     Stream_Write_UINT64(output_stream, file->ctime); /* VolumeCreationTime */
     Stream_Write(output_stream, "GUAC", 4);          /* VolumeSerialNumber */
     Stream_Write_UINT32(output_stream, GUAC_FILESYSTEM_NAME_LENGTH);
     Stream_Write_UINT8(output_stream, FALSE); /* SupportsObjects */
-    Stream_Write_UINT8(output_stream, 0);     /* Reserved */
+    /* Reserved field must not be sent */
     Stream_Write(output_stream, GUAC_FILESYSTEM_NAME, GUAC_FILESYSTEM_NAME_LENGTH);
 
     svc_plugin_send((rdpSvcPlugin*) device->rdpdr, output_stream);