Fix/handle conversion with leading zeros