Fix the 64 bits code