Added parameter to exclude hyphen