#132 improve port fo 64 bits