Bumped to support 64 bit