Accounting for hyphens