Matcher groups to closure params fix