Fixed geometry and range for 64 bit