Fixed issue with replacing all hyphens