Fixed handling of hyphens.