Fix bug with param matcher