avoid multiple Regex matches
changed regex expression fixing failing tests