Fix 64bit issue