Changes to prevent errors when making matches.