Fixed argument handling in optional match
Merge pull request #2894 from pontusmelke/argumentids-optional-match

Fixed argument handling in optional match