need to fix leading zero issue