fix 64 bit isues