leading zeros issue resolved