diff --git a/checkpoint_raid.mkp b/checkpoint_raid.mkp
index 467b96242cf266c1002b8a3602e878519199bd49..7df6d51db31c44bcf44ed5d0e43b217cef8a4ac2 100644
Binary files a/checkpoint_raid.mkp and b/checkpoint_raid.mkp differ
diff --git a/checks/checkpoint_raid b/checks/checkpoint_raid
index b87d4743e1ee281c8b7a937bc82a57fd2010352d..1b384dff0e97ebcca4ddcb598fba26d1f873d12d 100644
--- a/checks/checkpoint_raid
+++ b/checks/checkpoint_raid
@@ -188,11 +188,6 @@ def check_checkpoint_raid(item, params, parse):
         4: 'READY',
     }
 
-    raiddiskid = {
-        0: 'Upper',
-        1: 'Lower',
-    }
-
     def getflags(flags, flags_description):
         description = ''
         flags = int(flags)
@@ -253,7 +248,7 @@ def check_checkpoint_raid(item, params, parse):
                             # yield 0, 'Disk ID %d state %s' % (diskid, raiddiskstate.get(disk.get('diskstate')))
                             disks_online += 1
 
-                        longoutput += '\n%s disk (id %d): ' % (raiddiskid.get(diskid), diskid)
+                        longoutput += '\nDisk id %d ' % diskid
                         longoutput += 'State: %s, ' % raiddiskstate.get(disk.get('diskstate'))
                         longoutput += 'Sync: %d%s, ' % (syncstate, '%')
                         longoutput += 'Size: %d GB, ' % disk.get('disksize')
@@ -286,28 +281,30 @@ check_info['checkpoint_raid'] = {
     'snmp_scan_function': lambda oid: (oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.2620.1.6.123.1') or
                                        oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.8072.3.2.10')) and
                                       oid('.1.3.6.1.4.1.2620.1.6.1.0', '').lower().startswith('svn foundation'),
-    'snmp_info': [('.1.3.6.1.4.1.2620.1.6.7.7.1.1', [  # CHECKPOINT-MIB::raidVolumeEntry
-        '1',  # raidVolumeIndex
-        '2',  # raidVolumeID
-        '3',  # raidVolumeType
-        '4',  # numOfDisksOnRaid
-        '5',  # raidVolumeMaxLBA
-        '6',  # raidVolumeState
-        '7',  # raidVolumeFlags
-        '8',  # raidVolumeSize
-    ]),
-                  ('.1.3.6.1.4.1.2620.1.6.7.7.2.1', [  # CHECKPOINT-MIB::raidDiskEntry
-                      '1',  # raidDiskIndex
-                      '2',  # raidDiskVolumeID
-                      '3',  # raidDiskID
-                      '4',  # raidDiskNumber
-                      '5',  # raidDiskVendor
-                      '6',  # raidDiskProductID
-                      '7',  # raidDiskRevision
-                      '8',  # raidDiskMaxLBA
-                      '9',  # raidDiskState
-                      '10',  # raidDiskFlags
-                      '11',  # raidDiskSyncState
-                      '12',  # raidDiskSize
-                  ])],
+    'snmp_info': [('.1.3.6.1.4.1.2620.1.6.7.7.1.1',  # CHECKPOINT-MIB::raidVolumeEntry
+                   [
+                       '1',  # raidVolumeIndex
+                       '2',  # raidVolumeID
+                       '3',  # raidVolumeType
+                       '4',  # numOfDisksOnRaid
+                       '5',  # raidVolumeMaxLBA
+                       '6',  # raidVolumeState
+                       '7',  # raidVolumeFlags
+                       '8',  # raidVolumeSize
+                   ]),
+                  ('.1.3.6.1.4.1.2620.1.6.7.7.2.1',  # CHECKPOINT-MIB::raidDiskEntry
+                   [
+                       '1',  # raidDiskIndex
+                       '2',  # raidDiskVolumeID
+                       '3',  # raidDiskID
+                       '4',  # raidDiskNumber
+                       '5',  # raidDiskVendor
+                       '6',  # raidDiskProductID
+                       '7',  # raidDiskRevision
+                       '8',  # raidDiskMaxLBA
+                       '9',  # raidDiskState
+                       '10',  # raidDiskFlags
+                       '11',  # raidDiskSyncState
+                       '12',  # raidDiskSize
+                   ])],
 }