Fixed bug with leading zeroes.