diff --git a/lib/config.py b/lib/config.py
index ab11a807..46d34bf0 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -37,7 +37,7 @@
     'x86_64':
         {
             'Linux': 'x64',
-            'Windows': 'ia32',
+            'Windows': 'x64',
             'Darwin': 'x64'
         },
     'x86':
diff --git a/lib/inputstreamhelper.py b/lib/inputstreamhelper.py
index 0c914ea1..b1aca519 100644
--- a/lib/inputstreamhelper.py
+++ b/lib/inputstreamhelper.py
@@ -118,6 +118,12 @@ def _inputstream_version(self):
     def _arch(self):
         """Map together and return the system architecture."""
         arch = platform.machine()
+        if arch == 'AMD64':
+            arch_bit = platform.architecture()[0]
+            if arch_bit == '32bit':
+                arch = 'x86'
+            elif arch_bit == '64bit':
+                arch = 'x86_64'
         if arch in config.X86_MAP:
             return config.X86_MAP[arch]
         elif 'armv' in arch: