Fix for new feature "first match"