diff --git a/tests/data b/tests/data
index 8d3c7de..1d0e070 160000
--- a/tests/data
+++ b/tests/data
@@ -1 +1 @@
-Subproject commit 8d3c7de5261f9ae55fb94066c414c9dc16e20b83
+Subproject commit 1d0e07075ef266331649121e6f06489a656ec4cb
diff --git a/vulnwhisp/vulnwhisp.py b/vulnwhisp/vulnwhisp.py
index 380a8b5..1c37a81 100755
--- a/vulnwhisp/vulnwhisp.py
+++ b/vulnwhisp/vulnwhisp.py
@@ -318,12 +318,12 @@ class vulnWhispererBase(object):
 
         # Get a single cvss score derived from cvss3 else cvss2
         if not 'cvss' in df:
+            if 'cvss2' in df:
+                df.loc[df['cvss2'].notnull(), 'cvss'] = df.loc[df['cvss2'].notnull(), 'cvss2']
+                df.loc[df['cvss2'].notnull(), 'cvss_severity'] = df.loc[df['cvss2'].notnull(), 'cvss2_severity']
             if 'cvss3' in df:
-                df['cvss'] = df['cvss3'].fillna(df['cvss2'])
-                df['cvss_severity'] = df['cvss3_severity'].fillna(df['cvss2_severity'])
-            elif 'cvss2' in df:
-                df['cvss'] = df['cvss2']
-                df['cvss_severity'] = df['cvss2_severity']
+                df.loc[df['cvss3'].notnull(), 'cvss'] = df.loc[df['cvss3'].notnull(), 'cvss3']
+                df.loc[df['cvss3'].notnull(), 'cvss_severity'] = df.loc[df['cvss3'].notnull(), 'cvss3_severity']
 
         self.logger.debug('Creating Unique Document ID')
         df['_unique'] = df.index.values