Added workaround for Windows 7 64-bit issues