Added handling of leading zeros.