Whoops, fixing hyphens too