CLUB-899, fixed with regex