Fixed leading zero problem