remove bugs in Windows x64 caused by long/long long issue