Fixed 32/64 bit issue