tweaked around the handling of 8 bytes int.