Fixed issue on some x64