fix parameterization on both loading and matching