Fixed leading 0 bug