Two-way support and remove limit on leading zeroes