Add 64-bit compatibility for issue #27