Fixed leading zero issue with 9s