Fix matching of parmaeters