diff --git a/backend/snapscan-scsi.c b/backend/snapscan-scsi.c
index 448c211b4..64db70648 100644
--- a/backend/snapscan-scsi.c
+++ b/backend/snapscan-scsi.c
@@ -954,7 +954,9 @@ static SANE_Status send_diagnostic (SnapScan_Scanner *pss)
 
     if (pss->pdev->model == PRISA620S    /* GP added */
         ||
-        pss->pdev->model == VUEGO610S)    /* SJU added */
+        pss->pdev->model == VUEGO610S    /* SJU added */
+        ||
+        pss->pdev->model == SNAPSCAN1236)   
     {
         return SANE_STATUS_GOOD;
     }
@@ -1175,8 +1177,11 @@ static SANE_Status download_firmware(SnapScan_Scanner * pss)
 
 /*
  * $Log$
- * Revision 1.12  2002/03/24 12:32:26  oliverschwartz
- * Snapscan backend version 1.4.9
+ * Revision 1.13  2002/04/10 21:27:31  oliverschwartz
+ * make bqelements static, don't send diagnostic cmd to Snapscan1236
+ *
+ * Revision 1.28  2002/04/10 21:01:02  oliverschwartz
+ * Disable send_diagnostic() for 1236s
  *
  * Revision 1.27  2002/03/24 12:11:20  oliverschwartz
  * Get name of firmware file in sane_init
diff --git a/backend/snapscan-usb.c b/backend/snapscan-usb.c
index 4b4d2eeca..6bf106019 100644
--- a/backend/snapscan-usb.c
+++ b/backend/snapscan-usb.c
@@ -366,7 +366,7 @@ static int is_queueable(const char *src)
 }
 
 static struct usb_busy_queue *bqhead=NULL,*bqtail=NULL;
-int bqelements=0;
+static int bqelements=0;
 
 static int enqueue_bq(int fd,const void *src, size_t src_size)
 {
@@ -452,8 +452,11 @@ static SANE_Status usb_request_sense(SnapScan_Scanner *pss) {
 
 /*
  * $Log$
- * Revision 1.8  2002/03/24 12:32:28  oliverschwartz
- * Snapscan backend version 1.4.9
+ * Revision 1.9  2002/04/10 21:27:31  oliverschwartz
+ * make bqelements static, don't send diagnostic cmd to Snapscan1236
+ *
+ * Revision 1.19  2002/04/10 21:00:33  oliverschwartz
+ * Make bqelements static
  *
  * Revision 1.18  2002/03/24 12:16:09  oliverschwartz
  * Better error report in usb_read