Add condition for non leading 0