modify conditions to make an exception for hyphen