Handle leading zeroes