Added protection for non 64 bit