Fixed issue with leading zeros; added special zero case