Fixed leading zeros bug