Fix leading zero issue