diff --git a/main.py b/main.py
index 48f05ccfc08cd2149b2da07e3a83b406ecf56d80..c1e2a8932e9084893564d66064c3e4108b0c44d4 100755
--- a/main.py
+++ b/main.py
@@ -47,7 +47,7 @@ def format_for_influx(cliout):
             'time': data['timestamp'],
             'fields': {
                 # Byte to Megabit
-                'bandwidth': data['download']['bandwidth'] / 125000,
+                'bandwidth': data['download']['bandwidth'],  #/125000
                 'bytes': data['download']['bytes'],
                 'elapsed': data['download']['elapsed']
             }
@@ -57,7 +57,7 @@ def format_for_influx(cliout):
             'time': data['timestamp'],
             'fields': {
                 # Byte to Megabit
-                'bandwidth': data['upload']['bandwidth'] / 125000,
+                'bandwidth': data['upload']['bandwidth'], #/125000
                 'bytes': data['upload']['bytes'],
                 'elapsed': data['upload']['elapsed']
             }
@@ -66,7 +66,7 @@ def format_for_influx(cliout):
             'measurement': 'packetLoss',
             'time': data['timestamp'],
             'fields': {
-                'packetLoss': data['packetLoss']
+                'packetLoss': int(data['packetLoss'])
             }
         }
     ]
@@ -81,6 +81,7 @@ def main():
         speedtest = subprocess.run(
             ["speedtest", "--accept-license", "--accept-gdpr", "-f", "json"], capture_output=True)
 
+        if speedtest.returncode == 0:  # Speedtest was successful.
         if speedtest.returncode == 0:  # Speedtest was successful.
             data = format_for_influx(speedtest.stdout)
             print("Speedtest Successful:")