64 bit fix